diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 14:42:32 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 14:42:32 +0200 |
commit | 12102199c4b3a042fb91e1d52eb274f06e62213e (patch) | |
tree | 6e8d19a7a004bcc3fb03c2290a630281a846ff86 /runtime | |
parent | e61672c6932868d6b09ad0ae8453dc91c545742f (diff) | |
parent | 5d67d98c35da731eab933dbfd858a0e009aa58de (diff) | |
download | rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.tar.gz rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.tar.xz rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/conf.c | 2 | ||||
-rw-r--r-- | runtime/rsyslog.h | 3 | ||||
-rw-r--r-- | runtime/stream.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 858dbbfa..3f191292 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -922,7 +922,7 @@ static rsRetVal cflineProcessPropFilter(uchar **pline, register rule_t *f) } /* skip to action part */ - if((iRet = parsSkipWhitespace(pPars)) != RS_RET_OK) { + if((iRet = parsSkipWhitespace(pPars, 1)) != RS_RET_OK) { errmsg.LogError(0, iRet, "error %d skipping to action part - ignoring selector", iRet); rsParsDestruct(pPars); return(iRet); diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 65ed70db..06438081 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -345,7 +345,8 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth 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 */ RS_RET_OUTDATED_STMT = -2184, /**< some outdated statement/functionality is being used in conf file */ - RS_RET_OK_WARN = -2185, /**< config part: everything was OK, but a warning message was emitted */ + RS_RET_MISSING_WHITESPACE = -2185, /**< whitespace is missing in some config construct */ + RS_RET_OK_WARN = -2186, /**< config part: everything was OK, but a warning message was emitted */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ diff --git a/runtime/stream.c b/runtime/stream.c index 0238d25e..6b88d3f4 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -1036,7 +1036,7 @@ asyncWriterThread(void *pPtr) continue; /* now we should have data */ } bTimedOut = 0; - timeoutComp(&t, pThis->iFlushInterval * 2000); /* *1000 millisconds */ // TODO: check the 2000?!? + timeoutComp(&t, pThis->iFlushInterval * 1000); /* *1000 millisconds */ if(pThis->bDoTimedWait) { if(pthread_cond_timedwait(&pThis->notEmpty, &pThis->mut, &t) != 0) { int err = errno; |