summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mention systemd update in ChangeLogRainer Gerhards2013-03-211-0/+1
|
* Merge branch 'v6-stable' into v7-stableRainer Gerhards2013-03-212-37/+136
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-212-37/+136
| |\
| | * update systemd files to match current systemd sourceRainer Gerhards2013-03-212-37/+136
| | |
* | | bugfix: stdout/stderr were not closed on forkingRainer Gerhards2013-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Conflicts: ChangeLog
* | | bugfix: imudp scheduling parameters did affect main thread, not imudpRainer Gerhards2013-03-213-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=409 Conflicts: ChangeLog
* | | cleanupRainer Gerhards2013-03-201-1/+1
| | |
* | | bugfix: imuxsock rate-limiting could not be configured via legacy confMilan Bartos2013-03-202-0/+9
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stableRainer Gerhards2013-03-202-1/+4
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | bugfix: $mmnormalizeuseramsg paramter was specified with wrong typeRainer Gerhards2013-03-202-1/+4
| | | | | | | | | | | | | | | | | | | | Thanks to Renzhong Zhang for alerting us of the problem. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=420
* | | | doc: mention merged bugfix in ChangeLogRainer Gerhards2013-03-201-0/+3
| | | |
* | | | Merge branch 'v6-stable' into tmpRainer Gerhards2013-03-203-15/+17
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-201-13/+15
| |\|
| | * bugfix: get rid of potential endless loop in doGetGID()Tomas Heinrich2013-03-201-13/+15
| | |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-125-3/+9
| |\| | | | | | | | | | | | | | | | Conflicts: action.c queue.c (some code moved from action.c --> queue.c)
| | * bugfix: divide action queue discard mark by 10 - was out of rangeTomas Heinrich2013-03-121-2/+2
| | |
* | | Merge branch 'v7-stable' of git+ssh://git.adiscon.com/git/rsyslog into v7-stableRainer Gerhards2013-03-200-0/+0
|\ \ \
| * | | bugfix: RainerScript getenv() function caused segfault when var was not foundPhilippe Muller2013-03-202-1/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | bugfix: RainerScript getenv() function caused segfault when var was not foundPhilippe Muller2013-03-202-1/+8
|/ / / | | | | | | | | | | | | | | | | | | This patch is released under ASL 2.0 as of email conversation from 2013-03-20. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | require newer libestr due to a bug in itRainer Gerhards2013-03-191-1/+1
| | |
* | | doc: mention last patches in ChangeLogRainer Gerhards2013-03-181-6/+8
| | |
* | | Do not exit when messages get overwritten in the circular bufferMilan Bartos2013-03-181-0/+4
| | | | | | | | | | | | modified: plugins/imkmsg/kmsg.c
* | | Fix message read buffer sizeMilan Bartos2013-03-181-2/+2
| | | | | | | | | | | | modified: plugins/imkmsg/kmsg.c
* | | Remove unnecessary strlen() callMilan Bartos2013-03-181-1/+1
| | | | | | | | | | | | modified: plugins/imkmsg/kmsg.c
* | | Fix trailing '-' in kernel messages.Milan Bartos2013-03-181-0/+4
| | | | | | | | | | | | modified: plugins/imkmsg/kmsg.c
* | | debug system improvement & bug fix for init system status (see below)Rainer Gerhards2013-03-154-20/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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: imuxsock was missing SysSock.ParseTrusted module parameterRainer Gerhards2013-03-153-6/+28
| | | | | | | | | | | | | | | | | | To use that functionality, legacy rsyslog.conf syntax had to be used. Also, the doc was missing information on the "ParseTrusted" set of config directives.
* | | doc bugfix: rsyslog.conf man page had invalid file format infoRainer Gerhards2013-03-112-1/+5
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=418
* | | preparing for 7.2.6 releasev7.2.6Rainer Gerhards2013-03-053-3/+3
| | |
* | | add bug tracker ID to ChangeLog bugfixRainer Gerhards2013-02-281-0/+1
| | |
* | | bugfix: include files got included in the wrong orderRainer Gerhards2013-02-283-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | This happens if an $IncludeConfig directive was done on multiple files (e.g. the distro default of $IncludeConfig /etc/rsyslog.d/*.conf). In that case, the order of include file processing is reversed, which could lead to all sorts of problems. Thanks to Nathan Stratton Treadway for his great analysis of the problem, which made bug fixing really easy.
* | | doc: give quick example of ruleset() {} useRainer Gerhards2013-01-291-0/+8
| | |
* | | doc: add link for set statementRainer Gerhards2013-01-281-1/+2
| | |
* | | doc: some improvements and more cleanupRainer Gerhards2013-01-289-297/+119
| | |
* | | doc: some cleanupRainer Gerhards2013-01-283-3/+3
| | |
* | | move platfrom-specific files to their own subdirectoryRainer Gerhards2013-01-285-2/+94
| | |
* | | remove outdated sample rsyslog.confRainer Gerhards2013-01-282-61/+0
| | |
* | | typo fixRainer Gerhards2013-01-241-1/+1
| | |
* | | added omusrmsg changes to v7 compatibility docRainer Gerhards2013-01-241-1/+32
| | | | | | | | | | | | Thanks to Tomas Heinrich for pointing out that this was missing.
* | | - added $!all-json to property replacerRadu Gheorghe2013-01-241-1/+9
| | | | | | | | | | | | - specified that $!<name> can be used with CEE-enhanced syslog (once parsed via mmjsonparse)
* | | Merge branch 'v5-stable' into v7-stableRainer Gerhards2013-01-143-1/+7
|\ \ \ | | |/ | |/|
| * | doc: mention last patch in ChangeLogRainer Gerhards2013-01-141-0/+2
| | |
| * | bugfix: decrement string lengthTomas Heinrich2013-01-141-1/+3
| | |
| * | tcpflood: properly terminate when sending small filesRainer Gerhards2013-01-141-0/+2
| | |
* | | bugfix: omelasticsearch failed when authentication data was providedRainer Gerhards2013-01-132-1/+6
| | | | | | | | | | | | | | | | | | | | | ... at least in most cases it emitted an error message: "snprintf failed when trying to build auth string" Thanks to Joerg Heinemann for alerting us. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=404
* | | fix compile problem due to new (Solaris) compat layerRainer Gerhards2013-01-101-1/+1
| | | | | | | | | | | | | | | The compat layer was not fully integrated into the build system, causing ./configure to fail.
* | | bugfix: some property-based filter were incorrectly parsedRainer Gerhards2013-01-092-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This usually lead to a syntax error on startup and rsyslogd not actually starting up. The problem was the regex, which did not care for double quote characters to follow in the action part - unfortunately something that can frequently happen with v6+ format. An example: :programname, isequal, "as" {action(type="omfile" ...) } Here, the part :programname, isequal, "as" {action(type="omfile" was treated as the property filter, and the rest as action part. Obviously, this did not work out. Unfortunately, such situations usually resulted in very hard to understand error messages.
* | | improve config reader error messages a bit moreRainer Gerhards2013-01-091-6/+12
| | |
* | | slightly improved config parser error messages when invalid escapes happenRainer Gerhards2013-01-092-1/+5
| | |
* | | fix typo from last patch, prevented compile on non-solarisRainer Gerhards2013-01-091-2/+2
| | |