summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* preparing for 6.3.2v6.3.2Rainer Gerhards2011-07-064-19/+18
|
* Merge branch 'beta'Rainer Gerhards2011-07-067-11/+64
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-062-2/+11
| |
| * Merge branch 'v5-stable' into betaRainer Gerhards2011-07-067-19/+48
| |\ | | | | | | | | | | | | | | | 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
| * | | prepare for 6.1.10v6.1.10Rainer Gerhards2011-06-223-2/+14
| | | |
* | | | reduced sporadic failures during make checkRainer Gerhards2011-06-271-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the imdiag implementation of "queue empty" was a bit racy, which sometimes lead to too-early termination of rsyslogd and thus some small memory leaks (which in turn showed up as problems during make check). The current architecture is not able to 100% guard against this, but the probleme probability has been reduced (and it showed to improve in practice).
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-2728-187/+585
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c
| * | | | 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
| * | | | 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 '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
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |