summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
| | | | libtool archives are not meant to be shipped in the source tarball.
* bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-201-0/+1
|
* Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-251-1/+10
| | | | Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly.
* bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-281-0/+1
| | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug.
* cleanup: remove left-over commented-out codeRainer Gerhards2012-08-251-10/+0
|
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-252-22/+71
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-4/+59
| |\ | | | | | | | | | | | | Conflicts: runtime/ruleset.c
| | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-221-1/+40
| | | | | | | | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog.
| * | changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-221-3/+3
| | | | | | | | | | | | This is done to prevent name claches with libraries.
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-151-0/+1
| |\ \
* | \ \ Merge branch 'v5-stable' into betaRainer Gerhards2012-08-201-3/+19
|\ \ \ \ | | |_|/ | |/| |
| * | | bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-011-3/+19
| | |/ | |/| | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347
| * | bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-121-0/+1
| | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. ---------------------------------------------
* | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-291-1/+1
|\ \ \
| * | | omelasticsearch: added transactional interface & better debug outputRainer Gerhards2012-05-241-1/+1
| | | |
* | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-061-0/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: runtime/modules.c
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-061-0/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c
| | * | add small delay (50ms) after sending shutdown messageRainer Gerhards2012-06-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | There seem to be cases where the shutdown message is otherwise not processed, not even on an idle system. Thanks to Marcin for bringing this problem up.
* | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-011-2/+2
|\| | |
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-011-2/+2
| |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| | * | cosmetic: slightly improved debug outputRainer Gerhards2012-05-311-2/+2
| | | |
* | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-291-0/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-291-0/+3
| |\| |
| | * | bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if rsyslog was set to auto-background (thus fork, the default) and debug mode to stdout was enabled, debug messages ended up in the first log file opened. Currently, stdout logging is completely disabled in forking mode (but writing to the debug log file is still possible). This is a change in behaviour, which is under review. If it causes problems to you, please let us know. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | cleanup: removing no longer needed macrosRainer Gerhards2012-05-041-1/+1
| | | |
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-031-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | debug: slightly improved debug info for input module startupRainer Gerhards2012-05-031-0/+1
| | | |
* | | | cleanup no longer used variableRainer Gerhards2012-05-031-1/+0
| | | |
* | | | bugfix/omfile: template action parameter was not acceptedRainer Gerhards2012-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | (and template name set to "??" if the parameter was used) Thanks to Brian Knox for alerting us on this bug.
* | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-232-4/+2
| |_|/ |/| |
* | | Merge branch 'v5-beta'Rainer Gerhards2012-04-121-72/+97
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c
| * | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-73/+97
| |\ \
| | * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-73/+97
| | |\| | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c
| | | * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-1/+1
| | | |
| | | * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocalDomain points to "" or the domain in LocalHostName, allocate as new string before passing to SetLocalDomain or free will fail later. Signed-off-by: Marius Tomaschewski <mt@suse.com>
| | | * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-72/+93
| | | | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug.
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-073-9/+211
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | cosmetic: removed stray definitionRainer Gerhards2012-03-121-1/+0
| | | |
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
* | \ \ \ Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-8/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
| * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-1/+209
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: configure.ac
| * | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-9/+2
| | |_|/ | |/| | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step...
| * | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-0/+1
| | | | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF
| * | | queue: lightdelay config: keep default of 70% until mark is explicitely setRainer Gerhards2012-02-221-3/+5
| | | |
| * | | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-211-2/+6
| | | | | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens.
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-172-1/+209
|\ \ \ \
| * \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-172-1/+209
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | added tool to recover disk queue if .qi file is missing (recover_qi.pl)Kaiwang Chen2012-03-152-1/+209
| | |/ /
* | | | ompipe: cosmetic, rename varRainer Gerhards2012-01-271-12/+12
| | | |
* | | | ompipe: support for v6 config system addedRainer Gerhards2012-01-272-9/+63
| | | |