Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-11 | 6 | -7/+48 |
|\ | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | preparing for 5.8.3v5.8.3 | Rainer Gerhards | 2011-07-11 | 3 | -3/+6 |
| | | |||||
| * | added warning message for old-style outchannel syntax | Rainer Gerhards | 2011-07-11 | 3 | -1/+28 |
| | | |||||
| * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 5 | -6/+16 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| | * | preparing for 4.6.7 releasev4.6.7 | Rainer Gerhards | 2011-07-11 | 8 | -15/+16 |
| | | | |||||
| | * | support for :omfile: forward compatibility directive | Rainer Gerhards | 2011-07-11 | 3 | -3/+11 |
| | | | |||||
* | | | issue a warning if old omusrmsg action syntax is used | Rainer Gerhards | 2011-07-06 | 2 | -2/+11 |
| | | | |||||
* | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-07-06 | 6 | -11/+30 |
|\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html | ||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 5 | -11/+23 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | added support for the ":omusrmsg:" syntax in configuring user messages | Rainer Gerhards | 2011-07-06 | 3 | -8/+19 |
| | | | |||||
| | * | doc: ./configure --help invalidly showed imdiag enabled by default | Rainer Gerhards | 2011-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | Thanks to Frédéric L. W. Meunier for bringing this to my attention. | ||||
| | * | preparing for 4.6.6v4.6.6 | Rainer Gerhards | 2011-06-24 | 3 | -3/+3 |
| | | | |||||
| * | | doc: mentioned Lennart's patch in ChangeLog | Rainer Gerhards | 2011-07-02 | 1 | -0/+3 |
| | | | |||||
| * | | systemd: direct stdout/stderr of rsyslog to null | Lennart Poettering | 2011-07-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | This allows systemd upstream to set stdout/stderr of all spawned services by default to 'syslog'. In order to avoid log loops rsyslog itself must be have its stdout/stderr connected to 'null' in that case, however. | ||||
| * | | reduced sporadic failures during make check | Rainer Gerhards | 2011-06-30 | 1 | -9/+14 |
| | | | | | | | | | | | | backport from v6 | ||||
* | | | preparing for 5.9.1 releasev5.9.1 | Rainer Gerhards | 2011-06-30 | 4 | -6/+3 |
| | | | |||||
* | | | cosmetic: reformatted some code | Rainer Gerhards | 2011-06-30 | 1 | -12/+5 |
| | | | | | | | | | | | | so that more fits on a single screen --> useful for analysis | ||||
* | | | backported patch for testbench race reduction | Rainer Gerhards | 2011-06-30 | 1 | -9/+14 |
| | | | |||||
* | | | added support for obtaining timestamp for kernel message from message | Rainer Gerhards | 2011-06-24 | 6 | -99/+130 |
| | | | | | | | | | | | | | | | | | | | | | If the kernel time-stamps messages, time is now take from that timestamp instead of the system time when the message was read. This provides much better accuracy. Thanks to Lennart Poettering for suggesting this feature and his help during implementation. | ||||
* | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-21 | 14 | -69/+177 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2 | Rainer Gerhards | 2011-06-21 | 3 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | At least one case where this can occur is during thread shutdown, which may be initiated by lower activity. In most cases, this is quite unlikely to happen. However, if it does, data structures may be corrupted which could lead to fatal failure and segfault. I detected this via a testbench test, not a user report. But I assume that some users may have had unreproducable aborts that were cause by this bug. | ||||
| * | | preparing for 5.8.2 | Rainer Gerhards | 2011-06-21 | 4 | -4/+5 |
| | | | |||||
| * | | testbench: added new tests for failover cases | Rainer Gerhards | 2011-06-20 | 10 | -52/+130 |
| | | | |||||
| * | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-20 | 3 | -10/+14 |
| | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254 | ||||
* | | | added support for obtaining timestamp from system for imuxsock | Rainer Gerhards | 2011-06-20 | 6 | -47/+132 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This permits to read the time a message was submitted to the system log socket. Most importantly, this is provided in microsecond resolution. So we are able to obtain high precision timestampis even for messages that were - as is usual - not formatted with them. This also simplifies things in regard to local time calculation in chroot environments. Many thanks to Lennart Poettering for suggesting this feature, providing some guidance on implementing it and coordinating getting the necessary support into the Linux kernel. | ||||
* | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-16 | 10 | -57/+195 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-06-16 | 2 | -1/+7 |
| |\| | |||||
| | * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-06-16 | 2 | -1/+7 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: runtime/datetime.c | ||||
| | | * | bugfix: timestamp was incorrectly calculated for timezones with minute offset | Rainer Gerhards | 2011-06-16 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271 | ||||
| * | | | failover problem was not totally solved, now (hopefully ;)) | Rainer Gerhards | 2011-06-16 | 2 | -28/+64 |
| | | | | | | | | | | | | | | | | I overlooked a border case, which came up on a larger testbench run. | ||||
| * | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 5 | -52/+106 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) | ||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-06-15 | 1 | -1/+15 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_global.html | ||||
| | * | | doc: clarified requirements for $WorkDirectory directive | Rainer Gerhards | 2011-06-15 | 1 | -1/+2 |
| | | | | |||||
| * | | | bugfix/improvement:$WorkDirectory now gracefully handles trailing slashes | Rainer Gerhards | 2011-06-15 | 3 | -1/+24 |
| | | | | |||||
* | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-14 | 8 | -57/+615 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tcpsrv.c | ||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-06-14 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c | ||||
| * | | | bugfix: TLS-induced smaller memory still existed, now fixed | Rainer Gerhards | 2011-06-14 | 1 | -0/+3 |
| | | | | |||||
| * | | | backporting TLS-based test | Rainer Gerhards | 2011-06-14 | 3 | -0/+43 |
| | | | | |||||
| * | | | backported current tcpflood testing tool | Rainer Gerhards | 2011-06-14 | 2 | -55/+557 |
| | | | | | | | | | | | | | | | | so that we can improve v5's testbench as well | ||||
| * | | | bugfix: memory leak in imtcp & subsystems under some circumstances | Rainer Gerhards | 2011-06-10 | 3 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures. Note: this is a backport from v6. In v5, we currently do not have the toolchain to verify the original problem and that it is solved. So this patch is preliminary and subject to change as work progresses. | ||||
| * | | | somewhat improved debug logging | Rainer Gerhards | 2011-06-10 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2011-06-14 | 3 | -1/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c | ||||
| * \ \ \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-06-14 | 3 | -4/+12 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | bugfix: memory leak in imtcp & subsystems under some circumstances | Rainer Gerhards | 2011-06-14 | 3 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures. [backport from v6, limited testing under v4] | ||||
* | | | | | preparing for 5.9.0v5.9.0 | Rainer Gerhards | 2011-06-10 | 5 | -4/+5 |
| | | | | | |||||
* | | | | | $ActionName is now also used for naming of queues in impstats... | Rainer Gerhards | 2011-06-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ...as well as in the debug output. This functionality has now been fully tested. | ||||
* | | | | | bugfix: error state not correctly set for gone-away config directive | Rainer Gerhards | 2011-06-10 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | set queue name to aciton name (useful for impstats!) | Rainer Gerhards | 2011-06-07 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | so far untested, test follows | ||||
* | | | | | Merge branch 'v5-stable-imfile-batches' into v5-devel | Rainer Gerhards | 2011-06-06 | 8 | -9/+48 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | | imfile: added $InputFileMaxLinesAtOnce directive | Rainer Gerhards | 2011-05-24 | 4 | -3/+21 |
| | | | | | |