diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 18:22:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 18:22:25 +0200 |
| commit | c94345aa36c32277242684c307fe335bbc0fc3a8 (patch) | |
| tree | 51d3b21022408cb04cccb124c5eb1f1131d41865 | |
| parent | 92c185ccfa0b31b829874e8410bce6e8f3ab58b8 (diff) | |
| parent | b8916d5cf10130b34ba8982a88d912e9f3f1e1c4 (diff) | |
| download | rsyslog-c94345aa36c32277242684c307fe335bbc0fc3a8.tar.gz rsyslog-c94345aa36c32277242684c307fe335bbc0fc3a8.tar.bz2 rsyslog-c94345aa36c32277242684c307fe335bbc0fc3a8.zip | |
Merge branch 'v6-stable' into v6-beta
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | plugins/mmjsonparse/mmjsonparse.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -54,6 +54,12 @@ Version 6.5.0 [devel] 2012-08-28 http://bugzilla.adiscon.com/show_bug.cgi?id=353 --------------------------------------------------------------------------- Version 6.4.3 [V6-STABLE] 2012-??-?? +- change lumberjack cookie to "@cee" from "@cee " + 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. - bugfix: comments inside objects (e.g. action()) were not properly handled - bugfix: sysklogd-emulating standard template was no longer present in v6 This was obviously lost during the transition to the new config format. diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c index 03147b59..111ecc2f 100644 --- a/plugins/mmjsonparse/mmjsonparse.c +++ b/plugins/mmjsonparse/mmjsonparse.c @@ -99,7 +99,7 @@ BEGINtryResume CODESTARTtryResume ENDtryResume -#define COOKIE "@cee: " +#define COOKIE "@cee:" #define LEN_COOKIE (sizeof(COOKIE)-1) BEGINdoAction msg_t *pMsg; |