diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-01 16:09:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-01 16:09:59 +0200 |
| commit | 1b6d14f8aba6ee302c9fe063ddf900305eaefeb3 (patch) | |
| tree | 719aee5e69ff1dd9dcd1ae3add59febda1c86499 /ChangeLog | |
| parent | f4ec11fa779e7348f68ece1b3b50d499a0526ace (diff) | |
| parent | 9020647cdcdb0ef132491838e36c870f4e4e90ea (diff) | |
| download | rsyslog-1b6d14f8aba6ee302c9fe063ddf900305eaefeb3.tar.gz rsyslog-1b6d14f8aba6ee302c9fe063ddf900305eaefeb3.tar.xz rsyslog-1b6d14f8aba6ee302c9fe063ddf900305eaefeb3.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
runtime/queue.c
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -154,6 +154,13 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- Version 5.8.12 [V5-stable] 2012-05-?? +- bugfix: delayble source could block action queue, even if there was + a disk queue associated with it. The root cause of this problem was + that it makes no sense to delay messages once they arrive in the + action queue - the "input" that is being held in that case is the main + queue worker, what makes no sense. + Thanks to Marcin for alerting us on this problem and providing + instructions to reproduce it. - bugfix: disk queue was not persisted on shutdown, regression of fix to http://bugzilla.adiscon.com/show_bug.cgi?id=299 The new code also handles the case of shutdown of blocking light and |