Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ratelimit: add default ratelimiter | Rainer Gerhards | 2012-10-19 | 1 | -4/+14 |
| | |||||
* | cleanup | Rainer Gerhards | 2012-10-19 | 1 | -38/+0 |
| | |||||
* | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 3 | -40/+11 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | Merge branch 'beta' | Rainer Gerhards | 2012-10-18 | 2 | -3/+3 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | build: Drop unused CNF_LIBS variable | Michael Biebl | 2012-10-18 | 1 | -2/+2 |
| | | | |||||
| | * | doc: typo fix | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'beta' | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: rsyslog.service.in | ||||
| | | * | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions | ||||
* | | | | ratelimit: added linux-like ratelimiter type | Rainer Gerhards | 2012-10-15 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 3 | -5/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | ||||
| * | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 2 | -2/+8 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 1 | -1/+7 |
| | | | | |||||
| | * | | fix double-free | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: template.c | ||||
| | * | | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -2/+1 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-10 | 1 | -3/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | cosmetic cleanup | Rainer Gerhards | 2012-10-09 | 1 | -3/+1 |
| | | | | | |||||
* | | | | | ratelimiter: enable thread-safe mode & (related) API changes | Rainer Gerhards | 2012-10-15 | 1 | -32/+0 |
| | | | | | |||||
* | | | | | interface cleanup (probably not final) | Rainer Gerhards | 2012-10-15 | 1 | -11/+12 |
| | | | | | |||||
* | | | | | milestone: ratelimiter used in imptcp | Rainer Gerhards | 2012-10-15 | 1 | -0/+43 |
| | | | | | |||||
* | | | | | new ratelimit: interface plumbing added | Rainer Gerhards | 2012-10-09 | 1 | -5/+18 |
|/ / / / | | | | | | | | | | | | | no actual implementation yet done | ||||
* | | | | Merge branch 'c1-streamzip' into master-streamzip | Rainer Gerhards | 2012-10-05 | 1 | -3/+12 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c | ||||
| * | | | improved omfile zip writer to increase compression | Rainer Gerhards | 2012-09-14 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new setting $OMFileVeryReliableZip. | ||||
* | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -2/+1 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | ||||
| * | | | build: don't include librsyslog.la in the dist tarball | Michael Biebl | 2012-10-04 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball. | ||||
| * | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 2 | -0/+468 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 2 | -456/+468 |
| | | | | |||||
| * | | | add new tool "logctl" to access lumberjack logs in MongoDB | Ulrike Gerhards | 2012-10-02 | 1 | -0/+456 |
| | | | | |||||
* | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
|\| | | | |||||
| * | | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | | |||||
* | | | | bugfix: omfile action did not respect "template" parameter | Rainer Gerhards | 2012-09-19 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | ... and used default template in all cases | ||||
* | | | | correct library link order | Rainer Gerhards | 2012-09-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Evgeny Turnaev for alerting us on the problem and providing hits to the solution. | ||||
* | | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-06 | 2 | -1/+11 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsconf.c | ||||
| * | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 2 | -1/+11 |
| |\| | | |||||
| | * | | Fixed TCP CheckConnection handling in omfwd.c. | Andre Lorbach | 2012-08-25 | 1 | -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 handling | Rainer Gerhards | 2012-08-28 | 1 | -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 code | Rainer Gerhards | 2012-08-25 | 1 | -10/+0 |
| | | | | |||||
* | | | | new ruleengine: some cleanup | Rainer Gerhards | 2012-09-06 | 1 | -5/+0 |
|/ / / | |||||
* | | | add uuid property to message object | Jérôme Renard | 2012-08-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 2 | -25/+72 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| * | | 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 |
| |\ \ \ \ | | | |_|/ | | |/| | |