summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-26 12:29:08 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-26 12:29:08 +0200
commitd1589cd43978c700e2c88747e04d29c64a25d185 (patch)
tree768977702fbbc2eb0b847be947452a3b66aad0fc
parent3fd617f1acb7f1a057edb415cec1b144d210da81 (diff)
parent9a9282b86c785d7c0b67a0b546748e3591a487a2 (diff)
downloadrsyslog-d1589cd43978c700e2c88747e04d29c64a25d185.zip
rsyslog-d1589cd43978c700e2c88747e04d29c64a25d185.tar.gz
rsyslog-d1589cd43978c700e2c88747e04d29c64a25d185.tar.xz
Merge branch 'v6-stable'
-rw-r--r--ChangeLog12
-rw-r--r--runtime/msg.c2
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c6ec59..6b96d35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,18 @@ Version 6.4.1 [V6-STABLE] 2012-08-??
This lead to queue file corruption. While the root cause is a config
error, it is a bug that this important and hard to find config error
was not detected by rsyslog.
+- bugfix: "jsonf" property replacer option did generate invalid JSON
+ in JSON, we have "fieldname":"value", but the option emitted
+ "fieldname"="value". Interestingly, this was accepted by a couple
+ of sinks, most importantly elasticsearch. Now the correct format is
+ emitted, which causes a remote chance that some things that relied on
+ the wrong format will break.
+ Thanks to Miloslav Trmač for the patch
+- change $!all-json did emit an empty (thus non-JSON) string if no libee
+ data was present. It now emits {} and thus valid JSON. There is a
+ small risk that this may break some things that relied on the previous
+ inconsistency.
+ Thanks to Miloslav Trmač for the patch
---------------------------------------------------------------------------
Version 6.4.0 [V6-STABLE] 2012-08-20
- THIS IS THE FIRST VERSION OF THE 6.4.x STABLE BRANCH
diff --git a/runtime/msg.c b/runtime/msg.c
index 61c2f87..44d36fe 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2734,7 +2734,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
if(pMsg->event == NULL) {
if(*pbMustBeFreed == 1)
free(pRes);
- pRes = (uchar*) "";
+ pRes = (uchar*) "{}";
*pbMustBeFreed = 0;
} else {
ee_fmtEventToJSON(pMsg->event, &str);