summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-116-7/+48
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * preparing for 5.8.3v5.8.3Rainer Gerhards2011-07-113-3/+6
| |
| * added warning message for old-style outchannel syntaxRainer Gerhards2011-07-113-1/+28
| |
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-115-6/+16
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh
| | * preparing for 4.6.7 releasev4.6.7Rainer Gerhards2011-07-118-15/+16
| | |
| | * support for :omfile: forward compatibility directiveRainer Gerhards2011-07-113-3/+11
| | |
* | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-062-2/+11
| | |
* | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-066-11/+30
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/manual.html
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-065-11/+23
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-063-8/+19
| | |
| | * doc: ./configure --help invalidly showed imdiag enabled by defaultRainer Gerhards2011-07-061-1/+1
| | | | | | | | | | | | Thanks to Frédéric L. W. Meunier for bringing this to my attention.
| | * preparing for 4.6.6v4.6.6Rainer Gerhards2011-06-243-3/+3
| | |
| * | doc: mentioned Lennart's patch in ChangeLogRainer Gerhards2011-07-021-0/+3
| | |
| * | systemd: direct stdout/stderr of rsyslog to nullLennart Poettering2011-07-021-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 checkRainer Gerhards2011-06-301-9/+14
| | | | | | | | | | | | backport from v6
* | | preparing for 5.9.1 releasev5.9.1Rainer Gerhards2011-06-304-6/+3
| | |
* | | cosmetic: reformatted some codeRainer Gerhards2011-06-301-12/+5
| | | | | | | | | | | | so that more fits on a single screen --> useful for analysis
* | | backported patch for testbench race reductionRainer Gerhards2011-06-301-9/+14
| | |
* | | added support for obtaining timestamp for kernel message from messageRainer Gerhards2011-06-246-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-develRainer Gerhards2011-06-2114-69/+177
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | 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
* | | added support for obtaining timestamp from system for imuxsockRainer Gerhards2011-06-206-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-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
| | | | | |