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/stream.c | |
| parent | e61672c6932868d6b09ad0ae8453dc91c545742f (diff) | |
| parent | 5d67d98c35da731eab933dbfd858a0e009aa58de (diff) | |
| download | rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.tar.gz rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.tar.bz2 rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
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; |