| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-05-03 | 1 | -7/+47 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | bugfix: rsyslog did not terminate when delayable inputs were blocked | Rainer Gerhards | 2012-05-03 | 1 | -5/+42 |
| | | | | | | | | | | | | | | | ...due to unvailable sources. Fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=299 Thanks to Marcin M for bringing up this problem and Andre Lorbach for helping to reproduce and fix it. | ||||
| | * | bugfix: inside queue.c, some thread cancel states were not correctly reset. | Rainer Gerhards | 2012-05-03 | 1 | -5/+4 |
| | | | | | | | | | | | | | While this is a bug, we assume it did have no practical effect because the reset as it was done was set to the state the code actually had at this point. But better fix this... | ||||
| | * | bugfix: active input in "light delay state" could block rsyslog termination | Rainer Gerhards | 2012-04-27 | 1 | -0/+4 |
| | | | | | | | | | at least for prolonged period of time... | ||||
| * | | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 1 | -55/+57 |
| |\ \ | |||||
| | * | | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -55/+57 |
| | |/ | |||||
| | * | fixed compile bug | Rainer Gerhards | 2012-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | actually a regression from last bugfix - I just wonder why the other machine did not complain :-S | ||||
| * | | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-18 | 3 | -5/+41 |
| |\ \ | |||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-18 | 3 | -5/+41 |
| | |\| | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| | | * | bugfix: assigned ruleset was lost when using disk queues | Rainer Gerhards | 2012-04-18 | 3 | -8/+41 |
| | | | | | | | | | | | | | | | | | | | This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages stored inside the disk queue. | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-12 | 1 | -30/+58 |
| |\| | | |||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-12 | 1 | -30/+58 |
| | |\| | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/glbl.c | ||||
| | | * | Free also LocalDomain in glbl class destructor | Marius Tomaschewski | 2012-04-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.com> | ||||
| | | * | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 1 | -44/+63 |
| | | | | | | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug. | ||||
| * | | | permit size modifiers (k,m,g,...) in integer config parameters | Rainer Gerhards | 2012-04-07 | 1 | -31/+38 |
| | | | | | | | | | | | | | Thanks to Jo Rhett for the suggestion. | ||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-04-07 | 4 | -53/+123 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-04-07 | 1 | -4/+8 |
| | |\| | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | | * | bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵ | Tomas Heinrich | 2012-04-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | | * | bugfix: segfault if disk-queue was started up with old queue file | Tomas Heinrich | 2012-04-05 | 1 | -3/+6 |
| | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | unified use of $LocalHostIPIF among all locally-emitting inputs | Rainer Gerhards | 2012-03-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | with the exception of imdiag, which I humbly do not think needs this capabilit (even counter-productive for testbench use). | ||||
| | * | | milestone: added capability to use a local interface IP address as fromhost-ip | Rainer Gerhards | 2012-03-21 | 2 | -47/+113 |
| | | | | | | | | | | | | | | | | ... for locally originating messages. New directive $LocalHostIPIF. Note that not all modules yet support this new directive - next step... | ||||
| | * | | do not provide weblink with meaningless (generic) error code | Rainer Gerhards | 2012-03-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 4 | -38/+60 |
| |\| | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-14 | 4 | -38/+60 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h | ||||
| | | * | changed statsobj interface and added better doc | Rainer Gerhards | 2012-03-14 | 4 | -38/+60 |
| | | | | |||||
| * | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 7 | -5/+74 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | ||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-03-12 | 3 | -2/+11 |
| | |\| | |||||
| | | * | bugfix: stopped DA queue was never processed after a restart | Rainer Gerhards | 2012-03-12 | 3 | -2/+11 |
| | | | | | | | | | | | | | ...due to a regression from statistics module. | ||||
| | * | | added capability to use a local interface IP address as fromhost-ip for imuxsock | Rainer Gerhards | 2012-03-06 | 2 | -3/+57 |
| | | | | | | | | | | | | | new config directives: $IMUXSockLocalIPIF | ||||
| | * | | added configuration directives to customize queue light delay marks | Rainer Gerhards | 2012-02-21 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | $MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens. | ||||
| | * | | stats: added unique (and friendly) name for ruleset queues | Rainer Gerhards | 2012-01-31 | 1 | -1/+4 |
| | | | | |||||
| | * | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-30 | 3 | -16/+19 |
| | |\| | |||||
| * | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-03-01 | 3 | -16/+19 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-27 | 3 | -16/+19 |
| | |\ \ | |||||
| | | * | | bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵ | Rainer Gerhards | 2012-01-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | configured | ||||
| | | * | | relicense unlimited_select.h under ASL 2.0 | Rainer Gerhards | 2012-01-26 | 1 | -15/+14 |
| | | | | | | | | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich) | ||||
| | | * | | increased max config file line size to 64k | Rainer Gerhards | 2012-01-24 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug) | ||||
| * | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-16 | 67 | -1036/+912 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c | ||||
| | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-16 | 67 | -1036/+912 |
| | |\| | | | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c | ||||
| | | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 65 | -1001/+882 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h | ||||
| | | | * | license changes | Rainer Gerhards | 2012-01-16 | 45 | -704/+617 |
| | | | | | |||||
| | | | * | runtime license change | Rainer Gerhards | 2012-01-16 | 20 | -297/+265 |
| | | | | | |||||
| | | * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
| | | |\| | |||||
| | | | * | license change | Rainer Gerhards | 2012-01-14 | 2 | -35/+30 |
| | | | | | | | | | | | | | | | | | after careful consideration of affected code | ||||
| | * | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 |
| | |\| | | |||||
| * | | | | part of merge, but forgot to add to merge set | Rainer Gerhards | 2012-01-10 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmp | Rainer Gerhards | 2012-01-10 | 1 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c | ||||
| | * \ \ \ | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 1 | -1/+5 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c | ||||
| | | * | | | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
 |
index : rsyslog.git | |
| rsyslog development for Lumberjack - various unofficial and potentially rebased branches | Miloslav Trmac |
| summaryrefslogtreecommitdiffstats |