summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-1610-57/+195
|\ | | | | | | | | Conflicts: runtime/rsyslog.h
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-162-1/+7
| |\
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-06-162-1/+7
| | |\ | | | | | | | | | | | | | | | | Conflicts: runtime/datetime.c
| | | * bugfix: timestamp was incorrectly calculated for timezones with minute offsetRainer Gerhards2011-06-162-1/+4
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
| * | | failover problem was not totally solved, now (hopefully ;))Rainer Gerhards2011-06-162-28/+64
| | | | | | | | | | | | | | | | I overlooked a border case, which came up on a larger testbench run.
| * | | bugfix: problems in failover action handlingRainer Gerhards2011-06-165-52/+106
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-151-1/+15
| |\| | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_global.html
| | * | doc: clarified requirements for $WorkDirectory directiveRainer Gerhards2011-06-151-1/+2
| | | |
| * | | bugfix/improvement:$WorkDirectory now gracefully handles trailing slashesRainer Gerhards2011-06-153-1/+24
| | | |
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-148-57/+615
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tcpsrv.c
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-141-0/+3
| |\| | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c
| * | | bugfix: TLS-induced smaller memory still existed, now fixedRainer Gerhards2011-06-141-0/+3
| | | |
| * | | backporting TLS-based testRainer Gerhards2011-06-143-0/+43
| | | |
| * | | backported current tcpflood testing toolRainer Gerhards2011-06-142-55/+557
| | | | | | | | | | | | | | | | so that we can improve v5's testbench as well
| * | | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-103-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 loggingRainer Gerhards2011-06-101-0/+6
| | | |
* | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2011-06-143-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c
| * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-06-143-4/+12
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-143-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.0Rainer Gerhards2011-06-105-4/+5
| | | | |
* | | | | $ActionName is now also used for naming of queues in impstats...Rainer Gerhards2011-06-101-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 directiveRainer Gerhards2011-06-101-0/+1
| | | | |
* | | | | set queue name to aciton name (useful for impstats!)Rainer Gerhards2011-06-071-1/+6
| | | | | | | | | | | | | | | | | | | | so far untested, test follows
* | | | | Merge branch 'v5-stable-imfile-batches' into v5-develRainer Gerhards2011-06-068-9/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | | imfile: added $InputFileMaxLinesAtOnce directiveRainer Gerhards2011-05-244-3/+21
| | | | | |
| * | | | | enhanced imfile to support input batchingRainer Gerhards2011-05-242-1/+14
| | |_|/ / | |/| | |
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-201-5/+0
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | preparing for 5.8.1 stablev5.8.1Rainer Gerhards2011-05-193-3/+3
| | | | |
| * | | | omlibdbi: added necessary includeRainer Gerhards2011-05-121-0/+1
| | | | |
| * | | | mmsnmptrapd: removed unnecessary includesRainer Gerhards2011-05-121-3/+0
| | | | |
| * | | | doc: added merged important patch to ChangeLogRainer Gerhards2011-05-111-0/+10
| | | | |
* | | | | Merge branch 'v4-devel' into v5-develRainer Gerhards2011-05-201-5/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-201-5/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | cleanup: removed useless & undocumented config directive from imrelpRainer Gerhards2011-05-201-5/+0
| | | | |
| * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-112-2/+16
| |\| | |
* | | | | doc bugfix: yet another typoRainer Gerhards2011-05-132-2/+2
| | | | | | | | | | | | | | | | | | | | ... am I really that dumb... ;)
* | | | | mmsnmptrapd: doc bugfix and fix issue with config stmt handlerRainer Gerhards2011-05-132-4/+7
| | | | |
* | | | | added support to control KEEPALIVE settings in imptcpRainer Gerhards2011-05-133-2/+83
| | | | | | | | | | | | | | | | | | | | this has not yet been added to imtcp, but could be done on request
* | | | | imptcp: added capability to activate keep-alive at socket layerRainer Gerhards2011-05-113-7/+44
| | | | |
* | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-1111-1/+599
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | minor: made diagtalker output more clearRainer Gerhards2011-05-111-0/+3
| | | | | | | | | | | | | | | | | | | | prevents confusion during testbench run
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-112-1/+15
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: runtime/queue.c
| | * | | bugfix: invalid processing in QUEUE_FULL conditionRainer Gerhards2011-05-112-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 componentRainer Gerhards2011-05-101-0/+6
| | | | |
| * | | | Merge branch 'v5-stable-snmptrapd' into v5-stableRainer Gerhards2011-05-109-6/+573
| |\ \ \ \
| | * | | | mmsnmptrapd: added doc & mentioned in ChangeLogRainer Gerhards2011-05-105-6/+110
| | | | | |
| | * | | | Merge branch 'v5-stable' into v5-stable-snmptrapdRainer Gerhards2011-05-092-0/+8
| | |\ \ \ \
| | * | | | | cosmetic cleanupRainer Gerhards2011-05-091-2/+0
| | | | | | |
| | * | | | | mmsnmptrapd: added capability to specify severity mappingRainer Gerhards2011-05-091-2/+154
| | | | | | |
| | * | | | | mmsnmptrap: added TAG processingRainer Gerhards2011-05-061-1/+77
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 11:21:52 +0000