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 /runtime/stream.c | |
| 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
Diffstat (limited to 'runtime/stream.c')
| -rw-r--r-- | runtime/stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |