diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 15:03:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 15:03:53 +0200 |
| commit | e7701775553a60efb050b0df497bb4df5df46d62 (patch) | |
| tree | 5e8183f6bbb33e106624e8c9d9c3eab7a7006de9 /runtime/stream.c | |
| parent | 359ddad3c5dce82ab48964c1d8b804c4155ea39c (diff) | |
| parent | 12102199c4b3a042fb91e1d52eb274f06e62213e (diff) | |
| download | rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.tar.gz rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.tar.bz2 rsyslog-e7701775553a60efb050b0df497bb4df5df46d62.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
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; |