diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-22 18:03:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-22 18:03:43 +0200 |
| commit | 9757aeb56445eee3aca2b43e6b3efa1f1cb59ba3 (patch) | |
| tree | b44dad3ab3f3477c4b6c45b615b60f5e51f58e35 /runtime/rsconf.c | |
| parent | 6b8b7ba0091a4e59b9a45057756fc7f754576242 (diff) | |
| download | rsyslog-9757aeb56445eee3aca2b43e6b3efa1f1cb59ba3.tar.gz rsyslog-9757aeb56445eee3aca2b43e6b3efa1f1cb59ba3.tar.xz rsyslog-9757aeb56445eee3aca2b43e6b3efa1f1cb59ba3.zip | |
milestone: queue object now has a param handler for new conf interface
... and action queue defs use this new interface (but not yet the main queues)
Diffstat (limited to 'runtime/rsconf.c')
| -rw-r--r-- | runtime/rsconf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index 20c3b4f0..61e8ca96 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -345,7 +345,10 @@ parser_errmsg(char *fmt, ...) va_start(ap, fmt); if(vsnprintf(errBuf, sizeof(errBuf), fmt, ap) == sizeof(errBuf)) - errBuf[1023] = '\0'; + errBuf[sizeof(errBuf)-1] = '\0'; +dbgprintf("XXXX: msg: %s\n", errBuf); +dbgprintf("XXXX: cnfcurrfn: %s\n", cnfcurrfn); +dbgprintf("XXXX: yylineno: %d\n", yylineno); errmsg.LogError(0, RS_RET_CONF_PARSE_ERROR, "error during parsing file %s, on or before line %d: %s", cnfcurrfn, yylineno, errBuf); @@ -1258,6 +1261,7 @@ ourConf = loadConf; // TODO: remove, once ourConf is gone! "run, but no output whatsoever is created."); ABORT_FINALIZE(RS_RET_NO_ACTIONS); } + tellLexEndParsing(); tellCoreConfigLoadDone(); tellModulesConfigLoadDone(); |