summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-13 11:54:36 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-13 11:54:36 +0000
commit1b0bb1e8168d5b9e8ca5f535a29726e636bbf584 (patch)
tree402caa0bf31c5608ed4664bb37035f6c4d985f0d
parentde1f787307066bea620b3d6631ac68ebf657d561 (diff)
downloadrsyslog-1b0bb1e8168d5b9e8ca5f535a29726e636bbf584.tar.gz
rsyslog-1b0bb1e8168d5b9e8ca5f535a29726e636bbf584.tar.xz
rsyslog-1b0bb1e8168d5b9e8ca5f535a29726e636bbf584.zip
some cleanup
-rw-r--r--plugins/imfile/imfile.c6
-rw-r--r--stream.c1
2 files changed, 3 insertions, 4 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index f9c7d0ed..ce7134d2 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -148,10 +148,10 @@ openFile(fileInfo_t *pThis)
CHKiRet(strmSeekCurrOffs(pThis->pStrm));
- /* OK, we could successfully read the file, so we now can request that it be
- * deleted when we are done with the persisted information.
+ /* OK, we could successfully read the file, so we now can request that it be deleted.
+ * If we need it again, it will be written on the next shutdown.
*/
- // TODO: do we need this functionality? psSF->bNeedDelSF = 1;
+ psSF->bDeleteOnClose = 1;
finalize_it:
if(psSF != NULL)
diff --git a/stream.c b/stream.c
index 79d34d5d..e9f3d808 100644
--- a/stream.c
+++ b/stream.c
@@ -78,7 +78,6 @@ static rsRetVal strmOpenFile(strm_t *pThis)
CHKiRet(genFileName(&pThis->pszCurrFName, pThis->pszDir, pThis->lenDir,
pThis->pszFName, pThis->lenFName, pThis->iCurrFNum, pThis->iFileNumDigits));
} else {
-RUNLOG_VAR("%s", pThis->pszDir);
if(pThis->pszDir == NULL) {
if((pThis->pszCurrFName = (uchar*) strdup((char*) pThis->pszFName)) == NULL)
ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);