diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-27 17:27:26 +0000 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-27 17:27:26 +0000 |
commit | b87d6629d0eeb6b48ed2e1be25d15fb06b78fc22 (patch) | |
tree | 0f037c71615479997492e2e5fd6c1d311b9e813e /obj.c | |
parent | 5dd9a6792b4266006cb8b283e6e5996bbd5026a7 (diff) | |
download | rsyslog-b87d6629d0eeb6b48ed2e1be25d15fb06b78fc22.tar.gz rsyslog-b87d6629d0eeb6b48ed2e1be25d15fb06b78fc22.tar.xz rsyslog-b87d6629d0eeb6b48ed2e1be25d15fb06b78fc22.zip |
- bugfix: queue aborted when it was shut down, DA-enabled, DA mode was just
initiated but not fully initialized (a race condition)
- bugfix: queue properties sizeOnDisk, bytesRead were persisted to disk
with wrong data type (long instead of int64) - could cause problems on
32 bit machines
- fixed a problem introduced today, on-disk queue size was now wrongly
calculated (but not in any released version)
Diffstat (limited to 'obj.c')
-rw-r--r-- | obj.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -262,6 +262,12 @@ rsRetVal objSerializeProp(strm_t *pStrm, uchar *pszPropName, propType_t propType lenBuf = strlen((char*) szBuf); vType = VARTYPE_NUMBER; break; + case PROPTYPE_INT64: + CHKiRet(srUtilItoA((char*) szBuf, sizeof(szBuf), *((int64*) pUsr))); + pszBuf = szBuf; + lenBuf = strlen((char*) szBuf); + vType = VARTYPE_NUMBER; + break; case PROPTYPE_CSTR: pszBuf = rsCStrGetSzStrNoNULL((cstr_t *) pUsr); lenBuf = rsCStrLen((cstr_t*) pUsr); @@ -287,7 +293,7 @@ rsRetVal objSerializeProp(strm_t *pStrm, uchar *pszPropName, propType_t propType pszBuf = szBuf; break; default: - dbgprintf("invalid VARTYPE %d\n", propType); + dbgprintf("invalid PROPTYPE %d\n", propType); break; } |