summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* minor cleanupRainer Gerhards2012-11-151-8/+0
|
* silence compiler warnings & some cleanupRainer Gerhards2012-11-141-5/+1
|
* bugfix: very small memory leak in imrelpRainer Gerhards2012-11-141-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 againGuillem Jover2012-11-141-0/+2
| | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380
* Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-131-1/+1
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-131-1/+1
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * imuxsock: do not log EAGAIN in nonblocking recvfromMarius Tomaschewski2012-11-131-1/+1
| | |
* | | bugfix: potential abort of imtcp on rsyslogd shutdownRainer Gerhards2012-11-021-3/+3
| | |
* | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-018-8/+8
|\| |
| * | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-018-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-stableRainer Gerhards2012-11-011-1/+1
|\| |
| * | bugfix: misaddressing of $mmnormalizeuserawmsg parameterRainer Gerhards2012-11-011-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-betaRainer Gerhards2012-10-191-2/+2
| |\ \
| * \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-5/+0
| |\ \ \
| * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-172-3/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-161-8/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-111-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-6/+0
| |\ \ \ \ \ \ \
* | | | | | | | | bugfix: imzmq3 segfault with PULL subscriptionMartin Nilsson2012-10-301-2/+4
| | | | | | | | |
* | | | | | | | | ommongodb rate-limits error messages to prevent spamming the syslogRainer Gerhards2012-10-241-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366
* | | | | | | | | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-221-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 betaRainer Gerhards2012-10-191-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-191-2/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | * | | | | | fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-191-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-5/+0
|\| | | | | | |
| * | | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-191-5/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| | | | | | |
* | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-172-3/+5
|\| | | | | |
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-172-3/+5
| |\| | | | | | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | imklog: use memmove instead of memcpy (solaris)Marius Tomaschewski2012-10-171-1/+1
| | | | | |
| | * | | | imklog: use memmove to remove kernel timestampMarius Tomaschewski2012-10-171-1/+1
| | | | | |
| | * | | | imklog: skip leading spaces in kernel timestampMarius Tomaschewski2012-10-171-1/+3
| | | | | |
* | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-161-8/+2
|\| | | | |
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-161-8/+2
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * | | bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-161-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 Bartos2012-10-101-1/+5
| | | | | | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
| * | | | change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-111-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: cookieMiloslav Trmač2012-10-111-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 omrulesetRainer Gerhards2012-10-111-0/+6
| | | |
* | | | re-delete cust1.c plugin dummy fileRainer Gerhards2012-10-041-0/+0
| | | | | | | | | | | | | | | | This is no longer needed.
* | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-6/+0
|\| | | | | | | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-041-6/+0
| |\| |
| | * | remove cust1 dummy plugin from build systemRainer Gerhards2012-10-041-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 warningRainer Gerhards2012-10-021-4/+0
| | | |
* | | | cleanupRainer Gerhards2012-10-021-3/+0
| | | |
* | | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-021-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 ceelogMilan Bartos2012-10-021-0/+9
| | | | | | | | | | | | | | | | modified: mmjsonparse.c
* | | | implement imtcp "permittedPeers" module-global parameterRainer Gerhards2012-10-011-4/+20
| | | |
* | | | implement string arrays for config objectsRainer Gerhards2012-10-011-18/+35
| | | | | | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array
* | | | somewhat better debug outputRainer Gerhards2012-09-282-2/+6
| | | |