diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-09 09:16:50 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-09 09:16:50 +0100 |
| commit | dcf3e763194fce727ac3050bf6d2adbeef983530 (patch) | |
| tree | 2266085b5cccc2ecab7399083080d134b4777eda /plugins/mmjsonparse/mmjsonparse.c | |
| parent | b83e124aa772347a5b2f7d010dcc6f12b056a0a0 (diff) | |
| parent | 55d6eef1be47df7312e8e59a64ad9b0de6298f2f (diff) | |
| download | rsyslog-dcf3e763194fce727ac3050bf6d2adbeef983530.tar.gz rsyslog-dcf3e763194fce727ac3050bf6d2adbeef983530.tar.bz2 rsyslog-dcf3e763194fce727ac3050bf6d2adbeef983530.zip | |
Merge branch 'v7-stable' into v7-stable-libnet-frag
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'plugins/mmjsonparse/mmjsonparse.c')
| -rw-r--r-- | plugins/mmjsonparse/mmjsonparse.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/mmjsonparse/mmjsonparse.c b/plugins/mmjsonparse/mmjsonparse.c index 40cfa919..a13962ab 100644 --- a/plugins/mmjsonparse/mmjsonparse.c +++ b/plugins/mmjsonparse/mmjsonparse.c @@ -172,6 +172,7 @@ finalize_it: jval = json_object_new_string((char*)buf); json_object_object_add(json, "msg", jval); msgAddJSON(pMsg, (uchar*)"!", json); + iRet = RS_RET_OK; } MsgSetParseSuccess(pMsg, bSuccess); ENDdoAction |