summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-1610-57/+195
| |\ \ | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-148-57/+615
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tcpsrv.c
| * \ \ \ 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
| | |\ \ \ \
| * | | | | | 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-devel' into v5-develRainer Gerhards2011-05-201-5/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch 'v4-stable' into v4-develRainer 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
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'v4-devel' into v5-develRainer Gerhards2011-05-092-2/+8
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c tests/Makefile.am
| | * | | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-0915-21/+143
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| | * | | | | | | | | | bugfix: a slightly more informative error message when a TCPRainer Gerhards2011-05-023-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections is aborted
| | * | | | | | | | | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-242-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: root <root@localhost.localdomain>
| * | | | | | | | | | | added capability for imtcp to activate keep-alive packetsRainer Gerhards2011-05-096-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at the socket layer. reference: http://kb.monitorware.com/post20791.html
| * | | | | | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-036-6/+49
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | better handling of queue i/o errors in disk queues.Rainer Gerhards2011-05-034-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is kind of a bugfix, but a very intrusive one, thus it goes into the devel version first. Right now, "file not found" is handled and leads to the new emergency mode, in which disk action is stopped and the queue run in direct mode. An error message is emited if this happens.
* | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-06-2123-111/+390
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-06-2121-107/+355
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh
| | * | | | | | | | | | | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2Rainer Gerhards2011-06-213-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.2Rainer Gerhards2011-06-214-4/+5
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | testbench: added new tests for failover casesRainer Gerhards2011-06-2010-52/+130
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | bugfix: problems in failover action handlingRainer Gerhards2011-06-203-10/+14
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254
| | * | | | | | | | | | | 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
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | preparing for 6.1.9 releasev6.1.9Rainer Gerhards2011-06-143-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-06-148-5/+67
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/nsd_gtls.c tcpsrv.c tests/Makefile.am
| | * | | | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-141-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c
| | | * | | | | | | | | | 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]
| | * | | | | | | | | | 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
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | bugfix: $ActionFileDefaultTemplate did not workRainer Gerhards2011-06-022-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 03:27:06 +0000