From: Anoop Saldanha <poonaatsoc@gmail.com>
Date: Sun, 25 Mar 2012 05:43:44 +0000 (+0530)
Subject: don't return TM failure on failing to remove log file
X-Git-Tag: suricata-1.3beta1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd21b83f3e5d501226b26d1af6193b5210c1a1d6;p=thirdparty%2Fsuricata.git

don't return TM failure on failing to remove log file
---

diff --git a/src/log-pcap.c b/src/log-pcap.c
index e3460b1a3f..52e055478a 100644
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -207,13 +207,9 @@ int PcapLogRotateFile(ThreadVars *t, PcapLogData *pl) {
          SCLogDebug("Removing pcap file %s", pf->filename);
 
          if (remove(pf->filename) != 0) {
-             SCLogError(SC_ERR_PCAP_FILE_DELETE_FAILED,
-                 "failed to remove log file %s: %s",
-                 pf->filename, strerror( errno ));
-             TAILQ_REMOVE(&pcap_file_list, pf, next);
-
-             PcapFileNameFree(pf);
-             return -1;
+             SCLogWarning(SC_ERR_PCAP_FILE_DELETE_FAILED,
+                          "failed to remove log file %s: %s",
+                          pf->filename, strerror( errno ));
          }
          else {
              SCLogDebug("success! removed log file %s", pf->filename);
@@ -233,22 +229,17 @@ int PcapLogRotateFile(ThreadVars *t, PcapLogData *pl) {
                           pf->dirname, pfnext->dirname);
 
                       if (remove(pf->dirname) != 0) {
-                          SCLogError(SC_ERR_PCAP_FILE_DELETE_FAILED,
-                              "failed to remove sguil log %s: %s",
-                              pf->dirname, strerror( errno ));
-                          TAILQ_REMOVE(&pcap_file_list, pf, next);
-
-                          PcapFileNameFree(pf);
-                          return -1;
+                          SCLogWarning(SC_ERR_PCAP_FILE_DELETE_FAILED,
+                                       "failed to remove sguil log %s: %s",
+                                       pf->dirname, strerror( errno ));
                       }
                  }
              }
-
-             TAILQ_REMOVE(&pcap_file_list, pf, next);
-             PcapFileNameFree(pf);
-
-             pl->file_cnt--;
          }
+
+         TAILQ_REMOVE(&pcap_file_list, pf, next);
+         PcapFileNameFree(pf);
+         pl->file_cnt--;
     }
 
     if (PcapLogOpenFileCtx(pl) < 0) {