summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | | | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed version to 5.8.5-pre1
| * | | | | | | bugfixes for tag emulationRainer Gerhards2011-08-111-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation
* | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTagAndre Lorbach2011-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The syslogtag of the duplicated message could get contain garbage at the end as the string terminating NULL Byte was missing.
* | | | | | | | Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into ↵Andre Lorbach2011-08-103-6/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | v5-devel
| * \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-091-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added capability to emit config error location info for warningsRainer Gerhards2011-08-093-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
* | | | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-102-4/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'v5-stable-msgidfix' into v5-stableAndre Lorbach2011-08-101-3/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Cosmetic changeAndre Lorbach2011-07-271-2/+2
| | | | | | | | |
| | * | | | | | | Fixed a stupid return bug introduced by the last commitAndre Lorbach2011-07-271-1/+2
| | | | | | | | |
| | * | | | | | | Experimentally added mutex lock in getMSGID in order to fix bug 275.Andre Lorbach2011-07-261-3/+9
| | | | | | | | |
| * | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-091-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | bugfix: memcpy overflow can occur in allowed sender checkingMarius Tomaschewski2011-08-091-1/+1
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...if a host name is resolved to IPv4-mapped-on-IPv6 address. Found by Ismail Dönmez at suse. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | | Merge branch 'v3-stable' into v4-stableAndre Lorbach2011-08-051-7/+7
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | / / | | | | |_|/ / | | | |/| | | | | | | | | | Conflicts: runtime/msg.c
| | | * | | | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-051-7/+7
| | | | | | |
* | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-7/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-051-7/+9
| | |_|/ / / | |/| | | |
| * | | | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-0/+1
| | | | | |
* | | | | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-061-0/+1
| | | | | |
* | | | | | cosmetic: reformatted some codeRainer Gerhards2011-06-301-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | so that more fits on a single screen --> useful for analysis
* | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-212-5/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | bugfix: mutex was invalidly left unlocked during action processingv5.8.2Rainer Gerhards2011-06-211-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | bugfix: problems in failover action handlingRainer Gerhards2011-06-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254
* | | | | | added support for obtaining timestamp from system for imuxsockRainer Gerhards2011-06-202-35/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-164-6/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-06-161-1/+1
| |\| | | |
| | * | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-06-161-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/datetime.c
| | | * | | bugfix: timestamp was incorrectly calculated for timezones with minute offsetRainer Gerhards2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
| * | | | | bugfix: problems in failover action handlingRainer Gerhards2011-06-161-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
| * | | | | bugfix/improvement:$WorkDirectory now gracefully handles trailing slashesRainer Gerhards2011-06-152-1/+23
| | | | | |
* | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-142-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tcpsrv.c
| * | | | | bugfix: TLS-induced smaller memory still existed, now fixedRainer Gerhards2011-06-141-0/+3
| | | | | |
| * | | | | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-141-0/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Conflicts: tcpsrv.c
| * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-06-141-0/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures. [backport from v6, limited testing under v4]
| * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-111-2/+6
| |\| | | |
| * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-092-11/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
| * | | | | | bugfix: a slightly more informative error message when a TCPRainer Gerhards2011-05-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | connections is aborted
| * | | | | | bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: root <root@localhost.localdomain>
* | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-112-1/+11
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-111-1/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * | | | | bugfix: invalid processing in QUEUE_FULL conditionRainer Gerhards2011-05-111-2/+6
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | bugfix: $LocalHostName was not honored under all circumstancesRainer Gerhards2011-05-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=258
* | | | | | added capability for imtcp to activate keep-alive packetsRainer Gerhards2011-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at the socket layer. reference: http://kb.monitorware.com/post20791.html
* | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-032-2/+15
|\| | | | |
| * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-031-0/+11
| |\| | | |