diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:49:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-06 18:49:32 +0200 |
| commit | 27360bb33ff5e87a3852ebe2673170ebea168421 (patch) | |
| tree | 4b172b4c41a32ee2baa1baceb2b23339ace077f9 /tools/syslogd.c | |
| parent | f8ab9d166648f2b3af11bc3523e192bb3cd79219 (diff) | |
| parent | 29cd813960ed8e4f800cb9210d30888368587f1c (diff) | |
| download | rsyslog-27360bb33ff5e87a3852ebe2673170ebea168421.tar.gz rsyslog-27360bb33ff5e87a3852ebe2673170ebea168421.tar.xz rsyslog-27360bb33ff5e87a3852ebe2673170ebea168421.zip | |
Merge branch 'v5-beta' into beta
Conflicts:
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 8bcb3aa6..44e60b1c 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -849,6 +849,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"); |