diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 15:12:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 15:12:51 +0200 |
| commit | 29cd813960ed8e4f800cb9210d30888368587f1c (patch) | |
| tree | 7fd216d79c33106fb12bf744f995480f8665f357 /tools/syslogd.c | |
| parent | d6602c1a6cfd48ff1f5b7656eb429d60ce927ebc (diff) | |
| parent | 7f109cca88816752a9c9cbe255df9e3a5b5a8b5a (diff) | |
| download | rsyslog-29cd813960ed8e4f800cb9210d30888368587f1c.tar.gz rsyslog-29cd813960ed8e4f800cb9210d30888368587f1c.tar.bz2 rsyslog-29cd813960ed8e4f800cb9210d30888368587f1c.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/modules.c
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index fa2aba3c..9a331a83 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1083,6 +1083,11 @@ die(int sig) errno = 0; logmsgInternal(NO_ERRCODE, LOG_SYSLOG|LOG_INFO, (uchar*)buf, 0); } + /* we sleep for 50ms to give the queue a chance to pick up the exit message; + * otherwise we have seen cases where the message did not make it to log + * files, even on idle systems. + */ + srSleep(0, 50); /* drain queue (if configured so) and stop main queue worker thread pool */ DBGPRINTF("Terminating main queue...\n"); |