diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:41:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-29 17:41:28 +0200 |
| commit | d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2 (patch) | |
| tree | 3950a942de498562f7e5446d806746ed25501e1b | |
| parent | eafafc63597a600fceda5ac9ada90acd6e2f037e (diff) | |
| parent | 3e2be47ed69d2b4ce21777a75ad6128592e84d1d (diff) | |
| download | rsyslog-d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2.tar.gz rsyslog-d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2.tar.xz rsyslog-d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2.zip | |
Merge branch 'beta'
Conflicts:
runtime/rsyslog.h
| -rw-r--r-- | runtime/conf.c | 2 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 1 | ||||
| -rw-r--r-- | tools/syslogd.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 602a5eb1..7cdcf5ec 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -484,7 +484,7 @@ finalize_it: } if(bHadAnError && (iRet == RS_RET_OK)) { /* a bit dirty, enhance in future releases */ - iRet = RS_RET_ERR; + iRet = RS_RET_NONFATAL_CONFIG_ERR; } RETiRet; } diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 77d845fd..2f15f926 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -270,6 +270,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_ERR_FORK = -2118, /**< error during fork() */ RS_RET_ERR_WRITE_PIPE = -2119, /**< error writing to pipe */ RS_RET_RSCORE_TOO_OLD = -2120, /**< rsyslog core is too old for ... (eg this plugin) */ + RS_RET_NONFATAL_CONFIG_ERR = -2123, /**< non-fatal error during config processing */ RS_RET_FILENAME_INVALID = -2140, /**< filename invalid, not found, no access, ... */ /* RainerScript error messages (range 1000.. 1999) */ diff --git a/tools/syslogd.c b/tools/syslogd.c index d925505f..b43b7a37 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2613,7 +2613,7 @@ init(void) bHadConfigErr = 1; } - if(localRet != RS_RET_OK || iNbrActions == 0) { + if((localRet != RS_RET_OK && localRet != RS_RET_NONFATAL_CONFIG_ERR) || iNbrActions == 0) { /* rgerhards: this code is executed to set defaults when the * config file could not be opened. We might think about * abandoning the run in this case - but this, too, is not |