summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * remove unused variables (if SCM_CREDENTIALS is not available)Cristian Ionescu-Idbohrn2012-09-121-1/+5
| | |
| | * imuxsock: remove incorrect socket option callCristian Ionescu-Idbohrn2012-09-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCM_CREDENTIALS is not a socket option; its value is usually 0x2 which on most archs corresponds to socket option SO_REUSEADDR, but on mips-arch there is no socket option with value 0x2 and SO_REUSEADDR = 0x4, so the call will fail with ENOPROTOOPT 'Protocol not available'; skip it. There does not seem any other special setsockopt call is needed anyway, besides the above. In addition Jonny Törnbom commented: SCM_CREDENTIALS is a control message type, not a socket option, so using setsockopt(...SCM_CREDENTIALS...) is potentially dangerous and wrong and should be deleted from the code. (SCM_CREDENTIALS is used in conjuction with SO_PASSCRED which is the socket option to use.)
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-111-3/+1
| |\|
| | * fix compile problem on FreeBSDBrad Davis2012-09-111-3/+1
| | |
| * | Remove a no-effect ", NULL";Miloslav Trmač2012-08-261-1/+1
| | | | | | | | | | | | | | | | | | It does nothing, at is just confusing. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | milestone: ommongodb supports templates & JSON passing API in placeRainer Gerhards2012-08-291-15/+8
| | |
* | | adapted Mirek's changes to new JSON passing modeRainer Gerhards2012-08-292-47/+26
| | | | | | | | | | | | | | | now the complete code (JSON passing & ommongodb) could be tested and passed the module tests made during development
* | | Add template support: parse text, convert to BSONMiloslav Trmač2012-08-292-8/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses a json-c library (http://oss.metaparadigm.com/json-c/). With this, a template > $template MongoTemplate,"{%hostname:::jsonf:sys%, %$!all-json:2:$:%" and action > & action(type="ommongodb" db="ceelog" collection="local" template="MongoTemplate") will store a record created by > logger -d -u p/dev/log -p mail.info -t mymailer '@cee: {"false": false, "null": null, "true": true, "object": {"a":"a", "b":"b"}, "array": [1, 2, 3], "number1": 3, "number2": 3.14, "string": "String"}' as > { "_id" : ObjectId("5037bbfc97dd811374ce5a00"), "sys" : "kulicka", "false" : "false", "null" : "-", "true" : "true", "object.a" : "a", "object.b" : "b", "array.*" : "3", "number1" : "3", "number2" : "3.140000", "string" : "String" } which is not great, but fair enough given the current design of libee (the information loss manifests by the time of template processing, ommongodb can't fix it). Signed-off-by: Miloslav Trmač <mitr@redhat.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 16:35:30 +0000