Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | licensing update | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-16 | 2 | -1/+23 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c | |||||
| | * | | | | | | | | FQDN hostname for multihomed host was not always set to the correct name | Tomas Heinrich | 2012-01-16 | 2 | -2/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
| * | | | | | | | | | 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 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-14 | 43 | -647/+645 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c | |||||
| | * | | | | | | | more license analysis & change | Rainer Gerhards | 2012-01-14 | 11 | -178/+163 | |
| | | | | | | | | | ||||||
| | * | | | | | | | rsyslog.conf.5 socket module example sb imuxsock | Jim Hill | 2012-01-14 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | more files moved to ASL 2.0 | Rainer Gerhards | 2012-01-12 | 4 | -66/+58 | |
| | | | | | | | | | ||||||
| | * | | | | | | | some more files to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 7 | -108/+104 | |
| | | | | | | | | | ||||||
| | * | | | | | | | relicense parts under ASL 2.0 | Rainer Gerhards | 2012-01-11 | 20 | -294/+316 | |
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | after carful check for copyright holder | |||||
| * | | | | | | | relicense to ASL 2.0 | Rainer Gerhards | 2012-01-11 | 1 | -24/+14 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | finally cleaning up the syslog-ng rsyslog comparison | Rainer Gerhards | 2012-01-09 | 1 | -112/+123 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this page should be removed from the doc set over time -- it really does not belong here. | |||||
* | | | | | | | removed imtemplate/omtemplate template modules, as this was waste of time | Rainer Gerhards | 2012-01-09 | 7 | -770/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual input/output modules are better copy templates. Instead, the now-removed modules cost time for maintenance AND often caused confusion on what their role was. | |||||
* | | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-09 | 2 | -5/+9 | |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | | | final prep for 6.2.0v6.2.0 | Rainer Gerhards | 2012-01-09 | 2 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-09 | 4 | -7/+19 | |
| |\| | | | | | ||||||
| | * | | | | | bugfix: instabilities when using RFC5424 header fields | Kaiwang Chen | 2012-01-09 | 2 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | |||||
| * | | | | | | begin preparing for v6-stable | Rainer Gerhards | 2012-01-09 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-01-09 | 6 | -43/+12 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v6compatibility.html | |||||
| * | | | | | | removing $Begin, $End, $StrictScoping directives | Rainer Gerhards | 2012-01-09 | 6 | -44/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. ------------------------- | |||||
* | | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-20 | 6 | -10/+34 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | 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-devel' | Rainer Gerhards | 2011-12-19 | 9 | -14/+100 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c | |||||
| * | | | | | | 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 | |
| | |/ / / / | ||||||
| * | | | | | 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. | |||||
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-16 | 5 | -49/+250 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c | |||||
| * | | | | | enhanced module loader to not rely on PATH_MAX | Rainer Gerhards | 2011-12-16 | 2 | -34/+49 | |
| | | | | | | ||||||
| * | | | | | preparing for 5.9.4v5.9.4 | Rainer Gerhards | 2011-11-29 | 3 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | imuxsock: added capability to "annotate" messages with "trusted information", | Rainer Gerhards | 2011-11-29 | 3 | -11/+184 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which contains some properties obtained from the system and as such sure to not be faked. This is inspired by the similiar idea introduced in systemd. | |||||
| * | | | | | one further change to support gnutls without libgcrypt | Rainer Gerhards | 2011-10-21 | 1 | -0/+2 | |
| | | | | | |