diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:39:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:39:29 +0200 |
| commit | e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124 (patch) | |
| tree | 2783ebe1f2983311c0b85d738e093da9a2d02aff /plugins/ommongodb/ommongodb.c | |
| parent | de2fd07836accab563ecbf0405749b6bef9e76b4 (diff) | |
| parent | b151584d0929759284c0fb0399709e5ca0e29d60 (diff) | |
| download | rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.tar.gz rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.tar.bz2 rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.zip | |
Merge branch 'master' into master-ratelimit
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/ommongodb/ommongodb.c')
| -rw-r--r-- | plugins/ommongodb/ommongodb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/ommongodb/ommongodb.c b/plugins/ommongodb/ommongodb.c index 2c65f275..57ef20b2 100644 --- a/plugins/ommongodb/ommongodb.c +++ b/plugins/ommongodb/ommongodb.c @@ -233,11 +233,11 @@ getDefaultBSON(msg_t *pMsg) gint64 ts_gen, ts_rcv; /* timestamps: generated, received */ int secfrac; - procid = MsgGetProp(pMsg, NULL, PROP_PROGRAMNAME, NULL, &procid_len, &procid_free); - tag = MsgGetProp(pMsg, NULL, PROP_SYSLOGTAG, NULL, &tag_len, &tag_free); - pid = MsgGetProp(pMsg, NULL, PROP_PROCID, NULL, &pid_len, &pid_free); - sys = MsgGetProp(pMsg, NULL, PROP_HOSTNAME, NULL, &sys_len, &sys_free); - msg = MsgGetProp(pMsg, NULL, PROP_MSG, NULL, &msg_len, &msg_free); + procid = MsgGetProp(pMsg, NULL, PROP_PROGRAMNAME, NULL, &procid_len, &procid_free, NULL); + tag = MsgGetProp(pMsg, NULL, PROP_SYSLOGTAG, NULL, &tag_len, &tag_free, NULL); + pid = MsgGetProp(pMsg, NULL, PROP_PROCID, NULL, &pid_len, &pid_free, NULL); + sys = MsgGetProp(pMsg, NULL, PROP_HOSTNAME, NULL, &sys_len, &sys_free, NULL); + msg = MsgGetProp(pMsg, NULL, PROP_MSG, NULL, &msg_len, &msg_free, NULL); // TODO: move to datetime? Refactor in any case! rgerhards, 2012-03-30 ts_gen = (gint64) datetime.syslogTime2time_t(&pMsg->tTIMESTAMP) * 1000; /* ms! */ |