diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:43:03 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:43:03 +0200 |
commit | ba31ca0c288c71a714a93118acfb214879bf7b8f (patch) | |
tree | 670c914437ba781f34d6ab37962cb337711f7f26 /tools/syslogd.c | |
parent | 050db3854d664b47b8b27d7877984500c8ba9568 (diff) | |
parent | 7f109cca88816752a9c9cbe255df9e3a5b5a8b5a (diff) | |
download | rsyslog-ba31ca0c288c71a714a93118acfb214879bf7b8f.tar.gz rsyslog-ba31ca0c288c71a714a93118acfb214879bf7b8f.tar.xz rsyslog-ba31ca0c288c71a714a93118acfb214879bf7b8f.zip |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
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 1b057710..9e4b92fe 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1069,6 +1069,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"); |