Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | minor cleanup | Rainer Gerhards | 2012-11-15 | 1 | -8/+0 |
| | |||||
* | silence compiler warnings & some cleanup | Rainer Gerhards | 2012-11-14 | 1 | -5/+1 |
| | |||||
* | bugfix: very small memory leak in imrelp | Rainer Gerhards | 2012-11-14 | 1 | -0/+7 |
| | | | | | | | This is not a real problem (thus no ChangeLog entry): we leaked a few bytes for every relp listener, but only at rsyslogd TERMINATION - where obviously the OS does the cleanup. However, the leak could cause some confusion with memory checkers like valgrind. | ||||
* | bugfix: make rsyslog compile on kfreebsd again | Guillem Jover | 2012-11-14 | 1 | -0/+2 |
| | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380 | ||||
* | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-13 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | imuxsock: do not log EAGAIN in nonblocking recvfrom | Marius Tomaschewski | 2012-11-13 | 1 | -1/+1 |
| | | | |||||
* | | | bugfix: potential abort of imtcp on rsyslogd shutdown | Rainer Gerhards | 2012-11-02 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 8 | -8/+8 |
|\| | | |||||
| * | | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 8 | -8/+8 |
| | | | | | | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used. | ||||
* | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 1 | -1/+1 |
|\| | | |||||
| * | | bugfix: misaddressing of $mmnormalizeuserawmsg parameter | Rainer Gerhards | 2012-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | On many platforms, this has no effect at all. At some, it may cause a segfault. The problem occurs only during config phase, no segfault happens when rsyslog has fully started. | ||||
| * | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | bugfix: imzmq3 segfault with PULL subscription | Martin Nilsson | 2012-10-30 | 1 | -2/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | ommongodb rate-limits error messages to prevent spamming the syslog | Rainer Gerhards | 2012-10-24 | 1 | -13/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366 | ||||
* | | | | | | | | | disable deprecated warnings in omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem. | ||||
* | | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | Conflicts: runtime/nsdpoll_ptcp.c | ||||
| | * | | | | | | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
|\| | | | | | | | |||||
| * | | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIF | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | build: Drop unused include path | Michael Biebl | 2012-10-18 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| |\| | | | | | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | imklog: use memmove instead of memcpy (solaris) | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | imklog: use memmove to remove kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | imklog: skip leading spaces in kernel timestamp | Marius Tomaschewski | 2012-10-17 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
|\| | | | | | |||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | ||||
| | * | | | bugfix: imuxsock truncated head of received message | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more). | ||||
| | * | | | fix problem with cutting first 16 characters from message with bAnnotate on ↵ | Milan Bartos | 2012-10-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c | ||||
| * | | | | change lumberjack cookie to "@cee" from "@cee " | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch. | ||||
* | | | | Don't require the trailing space in @cee: cookie | Miloslav Trmač | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | The only mention of @cee: in the Lumberjack pages, https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space, and libumberlog does not in fact generate one. | ||||
* | | | | added deprecated note to omruleset | Rainer Gerhards | 2012-10-11 | 1 | -0/+6 |
| | | | | |||||
* | | | | re-delete cust1.c plugin dummy file | Rainer Gerhards | 2012-10-04 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | This is no longer needed. | ||||
* | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | ||||
| * | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| |\| | | |||||
| | * | | remove cust1 dummy plugin from build system | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for identifying this as the culprit for several build-related issues. The plugin is a placeholder, and was not used for quite some while. It is definitely not worth the effort to keep it along. If needed, can be quickly created. | ||||
* | | | | get rid of compiler warning | Rainer Gerhards | 2012-10-02 | 1 | -4/+0 |
| | | | | |||||
* | | | | cleanup | Rainer Gerhards | 2012-10-02 | 1 | -3/+0 |
| | | | | |||||
* | | | | mmjsonparse: also add MSG part of message if CEE-parsing fails | Rainer Gerhards | 2012-10-02 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In that case, the CEE/lumberjack spec says MSG is NON-CEE and must be treated accordingly. This means no JSON parsing happens. The case is equal to missing CEE cookie. Also adapted module to new interfaces provided by msg object. | ||||
* | | | | Change mmjsonparse so non-json messages doesn't get lost from ceelog | Milan Bartos | 2012-10-02 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | modified: mmjsonparse.c | ||||
* | | | | implement imtcp "permittedPeers" module-global parameter | Rainer Gerhards | 2012-10-01 | 1 | -4/+20 |
| | | | | |||||
* | | | | implement string arrays for config objects | Rainer Gerhards | 2012-10-01 | 1 | -18/+35 |
| | | | | | | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array | ||||
* | | | | somewhat better debug output | Rainer Gerhards | 2012-09-28 | 2 | -2/+6 |
| | | | |