Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 | ||||
* | | 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 | ||||
* | | 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 'v4-stable' into v5-stable | Rainer Gerhards | 2011-06-14 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | Conflicts: tcpsrv.c | ||||
| * | | 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] | ||||
* | | | 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-stable' into v5-stable | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 |
|\| | | |||||
| * | | cleanup: removed useless & undocumented config directive from imrelp | Rainer Gerhards | 2011-05-20 | 1 | -5/+0 |
| | | | |||||
* | | | preparing for 5.8.1 stablev5.8.1 | Rainer Gerhards | 2011-05-19 | 3 | -3/+3 |
| | | | |||||
* | | | omlibdbi: added necessary include | Rainer Gerhards | 2011-05-12 | 1 | -0/+1 |
| | | | |||||
* | | | mmsnmptrapd: removed unnecessary includes | Rainer Gerhards | 2011-05-12 | 1 | -3/+0 |
| | | | |||||
* | | | doc: added merged important patch to ChangeLog | Rainer Gerhards | 2011-05-11 | 1 | -0/+10 |
| | | | |||||
* | | | minor: made diagtalker output more clear | Rainer Gerhards | 2011-05-11 | 1 | -0/+3 |
| | | | | | | | | | | | | prevents confusion during testbench run | ||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-11 | 2 | -1/+15 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| * | | bugfix: invalid processing in QUEUE_FULL condition | Rainer Gerhards | 2011-05-11 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the the multi-submit interface was used and a QUEUE_FULL condition occured, the failed message was properly destructed. However, the rest of the input batch, if it existed, was not processed. So this lead to potential loss of messages and a memory leak. The potential loss of messages was IMHO minor, because they would have been dropped in most cases due to the queue remaining full, but very few lucky ones from the batch may have made it. Anyhow, this has now been changed so that the rest of the batch is properly tried to be enqueued and, if not possible, destructed. | ||||
* | | | undo accidental removal of a component | Rainer Gerhards | 2011-05-10 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'v5-stable-snmptrapd' into v5-stable | Rainer Gerhards | 2011-05-10 | 9 | -6/+573 |
|\ \ \ | |||||
| * | | | mmsnmptrapd: added doc & mentioned in ChangeLog | Rainer Gerhards | 2011-05-10 | 5 | -6/+110 |
| | | | | |||||
| * | | | Merge branch 'v5-stable' into v5-stable-snmptrapd | Rainer Gerhards | 2011-05-09 | 2 | -0/+8 |
| |\ \ \ | |||||
| * | | | | cosmetic cleanup | Rainer Gerhards | 2011-05-09 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | mmsnmptrapd: added capability to specify severity mapping | Rainer Gerhards | 2011-05-09 | 1 | -2/+154 |
| | | | | | |||||
| * | | | | mmsnmptrap: added TAG processing | Rainer Gerhards | 2011-05-06 | 1 | -1/+77 |
| | | | | | |||||
| * | | | | added skeleton for mmsnmptrapd | Rainer Gerhards | 2011-05-05 | 4 | -0/+237 |
| | | | | | |||||
* | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-09 | 2 | -2/+6 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | bugfix: invalid storage type for config variables | Rainer Gerhards | 2011-05-09 | 2 | -1/+2 |
| | | | |