Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v4-stable-tmp' into v5-devel-tmp | Rainer Gerhards | 2012-01-10 | 4 | -1/+13 |
|\ | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c | ||||
| * | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 4 | -1/+16 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c | ||||
| | * | added $SpaceLFOnReceive config directive | Tomas Heinrich | 2012-01-10 | 4 | -1/+16 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | Merge branch 'tmp' into v4-stable-tmp | Rainer Gerhards | 2012-01-10 | 2 | -0/+7 |
| |\| | |||||
| | * | added canned template for ultra-exact sysklogd file format | Tomas Heinrich | 2012-01-10 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | the point is that LF will be translated to SP Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2012-01-09 | 2 | -5/+7 |
|\ \ \ | |||||
| * | | | bugfix: instabilities when using RFC5424 header fields | Kaiwang Chen | 2012-01-09 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | Merge v5-stable-newstats & manual ChangeLog update | Rainer Gerhards | 2012-01-09 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-09 | 1 | -94/+86 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | | | push version number | Rainer Gerhards | 2012-01-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | imudp: added per-listner stats settings & more refactoring | Rainer Gerhards | 2012-01-09 | 1 | -74/+80 |
| | | | | | |||||
| * | | | | imudp refactor: field renaming (new names more more sense) | Rainer Gerhards | 2012-01-09 | 1 | -20/+19 |
| | | | | | |||||
| * | | | | imudp refactor: regression fix | Rainer Gerhards | 2012-01-09 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | imudp refactor: fixed socket leak | Rainer Gerhards | 2012-01-09 | 1 | -9/+5 |
| | | | | | |||||
| * | | | | nit fixed (testing aid removed) | Rainer Gerhards | 2012-01-08 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | cleanup of imudp to use better lstn data structure (part I) | Rainer Gerhards | 2012-01-08 | 1 | -68/+60 |
| | | | | | |||||
| * | | | | prepared milestone (version push) | Rainer Gerhards | 2011-12-21 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-20 | 6 | -10/+34 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| * | | | | Merge branch 'v5-stable' into v5-stable-newstats | Rainer Gerhards | 2011-12-20 | 2 | -3/+10 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | bugfix: stats counter were not properly initialized on creation | Rainer Gerhards | 2011-12-20 | 2 | -0/+3 |
| | | | | | |||||
| | * | | | bugfix: imuxsock did truncate part of received message if it did not contain ↵ | Rainer Gerhards | 2011-12-20 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295 | ||||
| * | | | | imtcp: added stats counters | Rainer Gerhards | 2011-12-20 | 3 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also adds counters to other users of tcpsrv.c method, but these do not work if default submit method is overwritten (currently only the case for imdiag, what we don't consider a problem) | ||||
| * | | | | bugfix: stats counter were not properly initialized on creation | Rainer Gerhards | 2011-12-20 | 2 | -0/+3 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -0/+17 |
|\| | | | | |||||
| * | | | | imudp: stats added | Rainer Gerhards | 2011-12-19 | 1 | -0/+17 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 2 | -7/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | | | better performance for action stats & cleanup: removing debug prints | Rainer Gerhards | 2011-12-19 | 2 | -7/+6 |
| | | | | | |||||
| * | | | | flagged special branch version | Rainer Gerhards | 2011-12-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 2 | -0/+6 |
|\| | | | | |||||
| * | | | | additional counter for lost messages due to failed actions added | Rainer Gerhards | 2011-12-19 | 2 | -0/+6 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 8 | -12/+73 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c | ||||
| * | | | | added instrumentation | Rainer Gerhards | 2011-12-19 | 6 | -6/+64 |
| |/ / / | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 4 | -4/+49 |
| |\| | | |||||
| | * | | bugfix: potential fatal abort in omgssapi | Tomas Heinrich | 2011-12-16 | 2 | -4/+4 |
| | | | | |||||
| | * | | added doc for omprog | Rainer Gerhards | 2011-12-16 | 3 | -0/+45 |
| | | | | |||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-01 | 3 | -2/+5 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: action.c | ||||
| | * | | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-12-01 | 3 | -2/+5 |
| | |\ \ | |||||
| | | * | | bugfix: action resume interval incorrectly handled, thus took longer to resumev3-stable | Tomas Heinrich | 2011-12-01 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | | * | | bugfix: cosmetic: proper constant used instead of number in open call | Tomas Heinrich | 2011-12-01 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| |\| | | | |||||
| | * | | | doc bugfix: typo in imgssapi doc | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| |\| | | | |||||
| | * | | | doc: imfile: clarified that empty lines are not processed | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-27 | 2 | -3/+15 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | bugfix: potential abort after reading invalid X.509 certificate | Tomas Heinrich | 2011-10-27 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | fixing memory leak in new stats code (delete statsobj) | Rainer Gerhards | 2011-12-16 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | experimental: added first stats counter to action object | Rainer Gerhards | 2011-12-16 | 3 | -7/+47 |
| | | | | | |||||
* | | | | | more work on queue statistics counter | Rainer Gerhards | 2011-12-16 | 4 | -8/+15 |
| | | | | | |||||
* | | | | | new stats counter "discarded" for queue object | Rainer Gerhards | 2011-12-16 | 4 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition. | ||||
* | | | | | enhanced module loader to not rely on PATH_MAX | Rainer Gerhards | 2011-12-16 | 2 | -34/+49 |
| | | | | |