diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-05 13:02:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-05 13:02:30 +0100 |
| commit | 6a61b91815b7be2320daa86b4392fda39aeb7be5 (patch) | |
| tree | 679927cc3a39f6b2a53de9b2b36f3b3630def214 | |
| parent | 4c92985ed2fabb7bb2030af03fac431ebafca12c (diff) | |
| download | rsyslog-6a61b91815b7be2320daa86b4392fda39aeb7be5.tar.gz rsyslog-6a61b91815b7be2320daa86b4392fda39aeb7be5.tar.bz2 rsyslog-6a61b91815b7be2320daa86b4392fda39aeb7be5.zip | |
very minimal improvement in reconstructing persisted queue entries
| -rw-r--r-- | runtime/msg.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index dca49a6d..5c6d199f 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -3619,8 +3619,6 @@ rsRetVal MsgSetProperty(msg_t *pThis, var_t *pProp) MsgSetMSGoffs(pThis, pProp->val.num); } else if(isProp("pszRawMsg")) { MsgSetRawMsg(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr), cstrLen(pProp->val.pStr)); - } else if(isProp("pszUxTradMsg")) { - /*IGNORE*/; /* this *was* a property, but does no longer exist */ } else if(isProp("pszTAG")) { MsgSetTAG(pThis, rsCStrGetSzStrNoNULL(pProp->val.pStr), cstrLen(pProp->val.pStr)); } else if(isProp("pszInputName")) { @@ -3654,14 +3652,16 @@ rsRetVal MsgSetProperty(msg_t *pThis, var_t *pProp) memcpy(&pThis->tTIMESTAMP, &pProp->val.vSyslogTime, sizeof(struct syslogTime)); } else if(isProp("pszRuleset")) { MsgSetRulesetByName(pThis, pProp->val.pStr); - } else if(isProp("pszMSG")) { - dbgprintf("no longer supported property pszMSG silently ignored\n"); } else if(isProp("json")) { tokener = json_tokener_new(); json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pProp->val.pStr), cstrLen(pProp->val.pStr)); json_tokener_free(tokener); msgAddJSON(pThis, (uchar*)"!", json); + } else if(isProp("pszMSG")) { + dbgprintf("no longer supported property pszMSG silently ignored\n"); + } else if(isProp("pszUxTradMsg")) { + /*IGNORE*/; /* this *was* a property, but does no longer exist */ } else { dbgprintf("unknown supported property '%s' silently ignored\n", rsCStrGetSzStrNoNULL(pProp->pcsName)); @@ -3992,8 +3992,6 @@ BEGINObjClassInit(msg, 1, OBJ_IS_CORE_MODULE) /* set our own handlers */ OBJSetMethodHandler(objMethod_SERIALIZE, MsgSerialize); - OBJSetMethodHandler(objMethod_SETPROPERTY, MsgSetProperty); - OBJSetMethodHandler(objMethod_CONSTRUCTION_FINALIZER, msgConstructFinalizer); /* initially, we have no need to lock message objects */ funcLock = MsgLockingDummy; funcUnlock = MsgLockingDummy; |