Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: add recent patch to ChangeLog | Rainer Gerhards | 2013-04-09 | 1 | -0/+2 |
| | |||||
* | Merge branch 'c7' into tmp | Rainer Gerhards | 2013-04-09 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/queue.c | ||||
| * | omrelp: add ability to specify session timeout | Rainer Gerhards | 2013-04-08 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'c7' | Rainer Gerhards | 2013-04-08 | 1 | -0/+1 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | omrelp: add support for RainerScript-based configuration | Rainer Gerhards | 2013-04-08 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-04-08 | 1 | -0/+20 |
|\| | | | | | | | | | | | Conflicts: grammar/rainerscript.c runtime/ruleset.c | ||||
| * | bugfix: failover/action suspend did not work correctly | Rainer Gerhards | 2013-04-07 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | This was experienced if the retry action took more than one second to complete. For suspending, a cached timestamp was used, and if the retry took longer, that timestamp was already in the past. As a result, the action never was kept in suspended state, and as such no failover happened. The suspend functionalit now does no longer use the cached timestamp (should not have any performance implication, as action suspend occurs very infrequently). Also added some better debug logging for the action engine. | ||||
| * | bugfix: nested if/prifilt conditions did not work properly | Rainer Gerhards | 2013-04-04 | 1 | -0/+2 |
| | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=415 | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-04-04 | 1 | -0/+2 |
|\| | |||||
| * | bugfix: script == comparison did not work properly on JSON objects | Rainer Gerhards | 2013-04-04 | 1 | -0/+2 |
| | | | | | | | | backport from 7.3 branch | ||||
* | | Merge branch 'v7-stable-info' | Rainer Gerhards | 2013-03-29 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog template.c | ||||
| * | | permit substring extraction relative to end-of-string in templates | Rainer Gerhards | 2013-03-29 | 1 | -0/+1 |
| |/ | |||||
* | | add RainerScript re_extract() function | Rainer Gerhards | 2013-03-27 | 1 | -0/+1 |
| | | |||||
* | | bugfix: imuxsock aborted under some conditions | Rainer Gerhards | 2013-03-27 | 1 | -0/+4 |
| | | | | | | | | regression from ratelimiting enhancements | ||||
* | | logsig: minimal end-user docv7.3.9 | Rainer Gerhards | 2013-03-26 | 1 | -1/+2 |
| | | |||||
* | | imudp: support user-selectable inputname | Rainer Gerhards | 2013-03-26 | 1 | -2/+3 |
| | | |||||
* | | mention systemd update in ChangeLog | Rainer Gerhards | 2013-03-21 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-03-21 | 1 | -0/+2 |
|\| | |||||
| * | mention systemd update in ChangeLog | Rainer Gerhards | 2013-03-21 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2013-03-21 | 1 | -0/+1 |
| |\ | |||||
| | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2013-03-21 | 1 | -0/+1 |
| | |\ | |||||
| | | * | update systemd files to match current systemd source | Rainer Gerhards | 2013-03-21 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2013-03-12 | 1 | -0/+2 |
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c queue.c (some code moved from action.c --> queue.c) | ||||
* | | | | keep omlibdbi usable with older libdbi without transaction support | Rainer Gerhards | 2013-03-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | in that case, omlibdbi gracefully degrades to non-transaction mode but emits a warning message during build, so that one knows an update of libdbi makes sense. | ||||
* | | | | omlibdbi: support transaction interface | Ulrike Gerhards | 2013-03-21 | 1 | -0/+1 |
| | | | | |||||
* | | | | Fix for glob(3)s that lack GLOB_NOMAGIC | Martin Carpenter | 2013-03-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-03-21 | 1 | -0/+2 |
|\| | | | |||||
| * | | | bugfix: imudp scheduling parameters did affect main thread, not imudp | Rainer Gerhards | 2013-03-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=409 Conflicts: ChangeLog | ||||
* | | | | bugfix: imudp scheduling parameters did affect main thread, not imudp | Rainer Gerhards | 2013-03-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=409 | ||||
* | | | | imfile: errors persisting state file are now reported | Rainer Gerhards | 2013-03-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=292 | ||||
* | | | | imuxsock: add ability to NOT create/delete sockets during startup and shutdown | Rainer Gerhards | 2013-03-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=259 | ||||
* | | | | imfile: now detects file change when rsyslog was inactive | Rainer Gerhards | 2013-03-20 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previosly, this case could not be detected, so if a file was overwritten or rotated away while rsyslog was stopped, some data was missing. This is now detected and the new file being forwarded right from the beginning. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=228 | ||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-03-20 | 1 | -0/+6 |
|\| | | | |||||
| * | | | bugfix: imuxsock rate-limiting could not be configured via legacy conf | Milan Bartos | 2013-03-20 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stable | Rainer Gerhards | 2013-03-20 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
* | | | | | bugfix: stdout/stderr were not closed on forking | Rainer Gerhards | 2013-03-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | but were closed when running in the forground - this was just reversed of what it should be. This is a regression of a recent change. | ||||
* | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2013-03-20 | 1 | -0/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * \ \ \ \ | Merge branch 'v7-stable' | Rainer Gerhards | 2013-03-20 | 1 | -0/+6 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | bugfix: $mmnormalizeuseramsg paramter was specified with wrong type | Rainer Gerhards | 2013-03-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Renzhong Zhang for alerting us of the problem. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=420 | ||||
| * | | | | | add recent bugfix to ChangeLog | Rainer Gerhards | 2013-03-20 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'v7-stable' into tmp | Rainer Gerhards | 2013-03-20 | 1 | -0/+6 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | doc: mention merged bugfix in ChangeLog | Rainer Gerhards | 2013-03-20 | 1 | -0/+3 |
| |/ / / | |||||
| * | | | bugfix: RainerScript getenv() function caused segfault when var was not found | Philippe Muller | 2013-03-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is released under ASL 2.0 as of email conversation from 2013-03-20. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-03-18 | 1 | -0/+12 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h tools/syslogd.c | ||||
| * | | | doc: mention last patches in ChangeLog | Rainer Gerhards | 2013-03-18 | 1 | -6/+8 |
| | | | | |||||
| * | | | debug system improvement & bug fix for init system status (see below) | Rainer Gerhards | 2013-03-15 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rsyslogd startup information is now properly conveyed back to init when privileges are beging dropped Actually, we have moved termination of the parent in front of the priv drop. So it shall work now in all cases. See code comments in commit for more details. - If forking, the parent now waits for a maximum of 60 seconds for termination by the child - improved debugging support in forked (auto-backgrounding) mode The rsyslog debug log file is now continued to be written across the fork. | ||||
* | | | | bugfix: mmanon did not build on some platforms (e.g. Ubuntu) | Rainer Gerhards | 2013-03-18 | 1 | -1/+2 |
| | | | | |||||
* | | | | bugfix: segfault in expression optimizer | Rainer Gerhards | 2013-03-15 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=423 | ||||
* | | | | imrelp: now supports listening to IPv4/v6 only instead of always both | Rainer Gerhards | 2013-03-15 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | build now requires librelp 1.0.2 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=378 | ||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-03-15 | 1 | -0/+4 |
|\| | | |