diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 10:47:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 10:47:31 +0200 |
| commit | bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d (patch) | |
| tree | b738285c841d66b7fbfccb94d136e06275c58553 | |
| parent | 43d9709847de6d286825ed8eb4db3ac702d8ab00 (diff) | |
| parent | 599a493cac7b067d34cba549c60f2d5bea9333b8 (diff) | |
| download | rsyslog-bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d.tar.gz rsyslog-bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d.tar.bz2 rsyslog-bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
doc/rsyslog_recording_pri.html
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | doc/property_replacer.html | 3 | ||||
| -rw-r--r-- | runtime/stream.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -240,6 +240,7 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-?? closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- Version 5.8.6 [V5-stable] 2011-??-?? +- bugfix: $OMFileFlushInterval period was doubled - now using correct value - bugfix: ActionQueue could malfunction due to index error Thanks to Vlad Grigorescu for the patch - bugfix: $ActionExecOnlyOnce interval did not work properly diff --git a/doc/property_replacer.html b/doc/property_replacer.html index 57592fd1..6456296a 100644 --- a/doc/property_replacer.html +++ b/doc/property_replacer.html @@ -65,8 +65,7 @@ BSD syslogd. For example, when TAG is "named[12345]", programname is </tr> <tr> <td><b>pri-text</b></td> -<td>the PRI part of the message in a textual form (e.g. -"syslog.info")</td> +<td>the PRI part of the message in textual form (e.g. "syslog.info")</td> </tr> <tr> <td><b>iut</b></td> 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; |