summaryrefslogtreecommitdiffstats
path: root/stream.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-01-11 14:48:15 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-01-11 14:48:15 +0000
commitf38f69b82c82ef61ff6d1da748a655e08b43cf53 (patch)
tree7bde3d6287600f4d920240428751a2eb43a694ec /stream.c
parentdd575394dba4f1943a5185a5f40750a4293b7203 (diff)
downloadrsyslog-f38f69b82c82ef61ff6d1da748a655e08b43cf53.tar.gz
rsyslog-f38f69b82c82ef61ff6d1da748a655e08b43cf53.tar.xz
rsyslog-f38f69b82c82ef61ff6d1da748a655e08b43cf53.zip
queue can now persist disk queue information on immediate shutdown
Diffstat (limited to 'stream.c')
-rw-r--r--stream.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/stream.c b/stream.c
index 7fb6aa74..344c2c66 100644
--- a/stream.c
+++ b/stream.c
@@ -311,7 +311,7 @@ rsRetVal strmDestruct(strm_t *pThis)
ISOBJ_TYPE_assert(pThis, strm);
- if(pThis->tOperationsMode == STREAMMODE_WRITE && pThis->iBufPtr > 0)
+ if(pThis->tOperationsMode == STREAMMODE_WRITE)
strmFlush(pThis);
/* ... then free resources */
@@ -626,7 +626,6 @@ rsRetVal strmSerialize(strm_t *pThis, strm_t *pStrm)
CHKiRet(objBeginSerialize(pStrm, (obj_t*) pThis));
-dbgprintf("strmSerialize in %p\n", pThis);
i = pThis->sType;
objSerializeSCALAR_VAR(pStrm, sType, INT, i);
objSerializeSCALAR(pStrm, iCurrFNum, INT);
@@ -636,7 +635,6 @@ dbgprintf("strmSerialize in %p\n", pThis);
i = pThis->tOpenMode;
objSerializeSCALAR_VAR(pStrm, tOpenMode, INT, i);
l = (long) pThis->iMaxFileSize;
-dbgprintf("max file size %ld, l: %ld\n", pThis->iMaxFileSize, l);
objSerializeSCALAR_VAR(pStrm, iMaxFileSize, LONG, l);
objSerializeSCALAR(pStrm, iMaxFiles, INT);
objSerializeSCALAR(pStrm, iFileNumDigits, INT);
@@ -644,7 +642,6 @@ dbgprintf("max file size %ld, l: %ld\n", pThis->iMaxFileSize, l);
CHKiRet(objEndSerialize(pStrm));
finalize_it:
-dbgprintf("strmSerialize out, iret %d\n", iRet);
return iRet;
}