diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-16 18:39:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-16 18:39:06 +0200 |
| commit | 475eb28e551f1b12ebde3b2f2ddb2c33403f192c (patch) | |
| tree | 247b9f1beab50d0355be1151b4e45d6da3260333 /runtime/rsyslog.h | |
| parent | c561994c108627c490729d98d671c45b4f9684e5 (diff) | |
| parent | b3dae5cff321e066bacc5e03846c77f832004006 (diff) | |
| download | rsyslog-475eb28e551f1b12ebde3b2f2ddb2c33403f192c.tar.gz rsyslog-475eb28e551f1b12ebde3b2f2ddb2c33403f192c.tar.xz rsyslog-475eb28e551f1b12ebde3b2f2ddb2c33403f192c.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime/rsyslog.h')
| -rw-r--r-- | runtime/rsyslog.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index d7f785f2..613a3e7a 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -342,7 +342,8 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_ERR_HDFS_OPEN = -2179, /**< error during hdfsOpen (e.g. file does not exist) */ RS_RET_FILE_NOT_SPECIFIED = -2180, /**< file name not configured where this was required */ RS_RET_ERR_WRKDIR = -2181, /**< problems with the rsyslog working directory */ - RS_RET_ERR_QUEUE_EMERGENCY = -2182, /**< some fatal error caused queue to switch to emergency mode */ + RS_RET_WRN_WRKDIR = -2182, /**< correctable problems with the rsyslog working directory */ + RS_RET_ERR_QUEUE_EMERGENCY = -2183, /**< some fatal error caused queue to switch to emergency mode */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |