summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* imklog: add new config params to module() parameter setRainer Gerhards2012-11-221-0/+6
| | | | | This is based on Marius Tomaschewski's set of patches, mostly just applied manually (as I need to mangle with the merge).
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-223-25/+43
|\ | | | | | | | | | | | | | | | | | | Note: this was not a simple merge, I rather needed to adopt the v5 code to the new v6 config handling. However, no v6 config format has been added yet (this is the next step). Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h
| * bugfix: imklog mistakenly took kernel timestamp subseconds as nanosecondsRainer Gerhards2012-11-221-12/+12
| | | | | | | | | | | | ... actually, they are microseconds. So the fractional part of the timestamp was not properly formatted. Thanks to Marius Tomaschwesky for the bug report and the patch idea.
| * imklog: added $klogParseKernelTimestamp optionMarius Tomaschewski2012-11-213-0/+7
| | | | | | | | | | | | | | | | When enabled, kernel message [timestamp] is converted for message time. Default is to use receive time as in 5.8.x and before, because the clock used to create the timestamp is not supposed to be as accurate as the monotonic clock (depends on hardware and kernel) resulting in differences between kernel and system messages which occurred at same time.
| * imklog: added $klogKeepKernelTimestamp optionMarius Tomaschewski2012-11-213-2/+8
| | | | | | | | | | When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too.
* | 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: 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.
* | 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 '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 v6-betaRainer Gerhards2012-10-191-5/+0
|\| |
| * | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-191-5/+0
| | |
* | | Merge branch 'v6-stable' into v6-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 v6-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
* | | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-111-1/+1
|\| |
| * | 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.
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-6/+0
|\| |
| * | 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.
* | | imtcp: implement support for module() parametersRainer Gerhards2012-09-281-38/+135
| | |
* | | imptcp: implement support for module() parametersRainer Gerhards2012-09-271-7/+70
| | |
* | | fix whitespace issueRainer Gerhards2012-09-271-1/+0
| | |
* | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-7/+2
| | | | | | | | | | | | This could lead to startup with invalid parameters.
* | | imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-271-9/+77
| | |
* | | yet another nitfix...Rainer Gerhards2012-09-271-1/+1
| | |
* | | nitfixRainer Gerhards2012-09-271-2/+2
| | |
* | | imfile: implement support for input()Rainer Gerhards2012-09-271-3/+78
| | |
* | | milestone: port imfile to v6 config systemRainer Gerhards2012-09-262-149/+279
| | |
* | | imrelp: implement support for input()Rainer Gerhards2012-09-261-10/+76
| | |
* | | imudp: implement support for input()Rainer Gerhards2012-09-262-9/+84
| | |
* | | imptcp: implement support for input()Rainer Gerhards2012-09-262-15/+119
| | |
* | | imtcp: implement support for input()Rainer Gerhards2012-09-261-10/+89
| | |
* | | Implement input() support in imuxsockRainer Gerhards2012-09-261-10/+119
| | |
* | | Merge branch 'v6-stable' into v6-devel-inputRainer Gerhards2012-09-261-0/+7
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-261-0/+7
| |\| | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | * enable DNS resolution in imrelpApollon Oikonomopoulos2012-09-261-0/+7
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | preparing for 6.4.2 releasev6.4.2Rainer Gerhards2012-09-201-0/+0
| | |
* | | bugfix: small memory leak in imdiagRainer Gerhards2012-09-201-0/+1
| | | | | | | | | | | | | | | This does not have any practical problems associated with it, EXCECPT that it caused almost all valgrind testbench tests to fail.
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-121-8/+6
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-121-5/+5
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 13:58:09 +0000