Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cleanup: remove left-over commented-out code | Rainer Gerhards | 2012-08-25 | 1 | -10/+0 |
| | |||||
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 2 | -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-beta | Rainer Gerhards | 2012-08-22 | 1 | -4/+59 |
| |\ | | | | | | | | | | | | | Conflicts: runtime/ruleset.c | ||||
| | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 1 | -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/RSFALSE | Rainer Gerhards | 2012-08-22 | 1 | -3/+3 |
| | | | | | | | | | | | | This is done to prevent name claches with libraries. | ||||
| * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-15 | 1 | -0/+1 |
| |\ \ | |||||
* | \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 1 | -3/+19 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | bugfix: potential abort if output plugin logged message during shutdown | Rainer Gerhards | 2012-08-01 | 1 | -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 modules | Rainer Gerhards | 2012-06-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. --------------------------------------------- | ||||
* | | | Merge branch 'master-elasticsearch' into tmp | Rainer Gerhards | 2012-06-29 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | omelasticsearch: added transactional interface & better debug output | Rainer Gerhards | 2012-05-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-06-06 | 1 | -0/+5 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: runtime/modules.c | ||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-06 | 1 | -0/+5 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/modules.c | ||||
| | * | | add small delay (50ms) after sending shutdown message | Rainer Gerhards | 2012-06-04 | 1 | -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 beta | Rainer Gerhards | 2012-06-01 | 1 | -2/+2 |
|\| | | | |||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-01 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| | * | | cosmetic: slightly improved debug output | Rainer Gerhards | 2012-05-31 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'v5-beta' into beta | Rainer Gerhards | 2012-05-29 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-29 | 1 | -0/+3 |
| |\| | | |||||
| | * | | bugfix: if debug message could end up in log file when forking | Tomas Heinrich | 2012-05-29 | 1 | -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 macros | Rainer Gerhards | 2012-05-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-03 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | debug: slightly improved debug info for input module startup | Rainer Gerhards | 2012-05-03 | 1 | -0/+1 |
| | | | | |||||
* | | | | cleanup no longer used variable | Rainer Gerhards | 2012-05-03 | 1 | -1/+0 |
| | | | | |||||
* | | | | bugfix/omfile: template action parameter was not accepted | Rainer Gerhards | 2012-05-03 | 1 | -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 parameters | Rainer Gerhards | 2012-04-23 | 2 | -4/+2 |
| |_|/ |/| | | |||||
* | | | Merge branch 'v5-beta' | Rainer Gerhards | 2012-04-12 | 1 | -72/+97 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c tools/syslogd.c | ||||
| * | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 1 | -73/+97 |
| |\ \ | |||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 1 | -73/+97 |
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c | ||||
| | | * | imuxsock: do not cache hostname | Rainer Gerhards | 2012-04-12 | 1 | -1/+1 |
| | | | | |||||
| | | * | Allocate LocalDomain as new string | Marius Tomaschewski | 2012-04-11 | 1 | -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 HUP | Rainer Gerhards | 2012-04-11 | 1 | -72/+93 |
| | | | | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug. | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 3 | -9/+211 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| * | | | cosmetic: removed stray definition | Rainer Gerhards | 2012-03-12 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 1 | -2/+9 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | ||||
* | \ \ \ | Merge branch 'v5-stable-newstats' | Rainer Gerhards | 2012-04-07 | 1 | -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-newstats | Rainer Gerhards | 2012-04-07 | 2 | -1/+209 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 1 | -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 imuxsock | Rainer Gerhards | 2012-03-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF | ||||
| * | | | queue: lightdelay config: keep default of 70% until mark is explicitely set | Rainer Gerhards | 2012-02-22 | 1 | -3/+5 |
| | | | | |||||
| * | | | added configuration directives to customize queue light delay marks | Rainer Gerhards | 2012-02-21 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens. | ||||
* | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-17 | 2 | -1/+209 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-17 | 2 | -1/+209 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | added tool to recover disk queue if .qi file is missing (recover_qi.pl) | Kaiwang Chen | 2012-03-15 | 2 | -1/+209 |
| | |/ / | |||||
* | | | | ompipe: cosmetic, rename var | Rainer Gerhards | 2012-01-27 | 1 | -12/+12 |
| | | | | |||||
* | | | | ompipe: support for v6 config system added | Rainer Gerhards | 2012-01-27 | 2 | -9/+63 |
| | | | | |||||
* | | | | cosmetic: remove compiler warnings | Rainer Gerhards | 2012-01-19 | 2 | -3/+2 |
| | | | | |||||
* | | | | refactor: remove very old sync.[ch] system for "abstracting" mutex access | Rainer Gerhards | 2012-01-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | This was a bad idea that never was used much. | ||||
* | | | | omshell: light cleanup | Rainer Gerhards | 2012-01-19 | 1 | -11/+7 |
| | | | | |||||
* | | | | v6.1/2 scoping support removed from plugins | Rainer Gerhards | 2012-01-19 | 6 | -25/+10 |
| | | | |