diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-07 12:26:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-07 12:26:23 +0200 |
| commit | 27deea809d478fb9984000898f92c89e7843ef49 (patch) | |
| tree | 8853242c960fdaedbf8c4cc6b4625caa66ad197c | |
| parent | 01cdda8a65f76cc1270fa788aa0847a4d2d13ed7 (diff) | |
| download | rsyslog-27deea809d478fb9984000898f92c89e7843ef49.tar.gz rsyslog-27deea809d478fb9984000898f92c89e7843ef49.tar.xz rsyslog-27deea809d478fb9984000898f92c89e7843ef49.zip | |
bugfix: properties inputname, fromhost, fromhost-ip were lost
... when working with disk queues.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | runtime/msg.c | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,7 @@ --------------------------------------------------------------------------- Version 4.5.1 [DEVEL] (rgerhards), 2009-07-?? +- bugfix: properties inputname, fromhost, fromhost-ip were lost when + working with disk queues - performance enhancement: much faster, up to twice as fast (depending on configuration) - bugfix: abort condition when RecvFrom was not set and message reduction diff --git a/runtime/msg.c b/runtime/msg.c index 0ce84f35..3b421dbe 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -942,8 +942,6 @@ static rsRetVal MsgSerialize(msg_t *pThis, strm_t *pStrm) assert(pThis != NULL); assert(pStrm != NULL); - /* "pump" some property values into strings */ - /* then serialize elements */ CHKiRet(obj.BeginSerialize(pStrm, (obj_t*) pThis)); objSerializeSCALAR(pStrm, iProtocolVersion, SHORT); @@ -965,11 +963,11 @@ static rsRetVal MsgSerialize(msg_t *pThis, strm_t *pStrm) objSerializePTR(pStrm, pszRawMsg, PSZ); objSerializePTR(pStrm, pszHOSTNAME, PSZ); getInputName(pThis, &psz, &len); - objSerializeSCALAR_VAR(pStrm, "pszInputName", PSZ, psz); + CHKiRet(obj.SerializeProp(pStrm, UCHAR_CONSTANT("pszInputName"), PROPTYPE_PSZ, (void*) psz)); psz = getRcvFrom(pThis); - objSerializeSCALAR_VAR(pStrm, "pszRcvFrom", PSZ, psz); + CHKiRet(obj.SerializeProp(pStrm, UCHAR_CONSTANT("pszRcvFrom"), PROPTYPE_PSZ, (void*) psz)); psz = getRcvFromIP(pThis); - objSerializeSCALAR_VAR(pStrm, "pszRcvFromIP", PSZ, psz); + CHKiRet(obj.SerializeProp(pStrm, UCHAR_CONSTANT("pszRcvFromIP"), PROPTYPE_PSZ, (void*) psz)); objSerializePTR(pStrm, pCSStrucData, CSTR); objSerializePTR(pStrm, pCSAPPNAME, CSTR); |