[ossec-dev] ossec-hids: logcollector.c (HEAD) logcollector.h (HEAD) main.c (HEAD) [dcid]

[OSSEC CVS <cvs-commit@xxxxxxxxx>]

Module name:	ossec-hids
Changes by:	dcid	06/09/10 11:27:45

Modified files:
	logcollector.c logcollector.h main.c

Log message:
Description: Fixing logcollector messages (more description and more config options)
Reviewed by: dcid
Bug:

Index: logcollector.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/logcollector/logcollector.c,v
diff -u -r1.27 -r1.28
--- logcollector.c	9 Sep 2006 20:06:53 -0000	1.27
+++ logcollector.c	10 Sep 2006 14:27:45 -0000	1.28
@@ -264,8 +264,14 @@
             
             
             /* Too many errors for the file */ 
-            if(logff[i].ign < -8)
+            if(logff[i].ign < (-open_file_attempts))
             {
+                /* -999 Maximum ignore */
+                if(logff[i].ign == -999)
+                {
+                    continue;
+                }
+                
                 merror(LOGC_FILE_ERROR, ARGV0, logff[i].file);
                 if(logff[i].fp)
                     fclose(logff[i].fp);
@@ -280,14 +286,14 @@
                 {
                     logff[i].file = NULL;
                 }
-                logff[i].ign = -10;
+                logff[i].ign = -999;
                 continue;
             }
            
             /* Files  */ 
             if(!logff[i].fp)
             {
-                if(logff[i].ign <= -10)
+                if(logff[i].ign <= -999)
                     continue;
                 else
                 {

Index: logcollector.h
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/logcollector/logcollector.h,v
diff -u -r1.13 -r1.14
--- logcollector.h	11 Jul 2006 19:16:54 -0000	1.13
+++ logcollector.h	10 Sep 2006 14:27:45 -0000	1.14
@@ -62,6 +62,7 @@
 
 int loop_timeout;
 int logr_queue;
+int open_file_attempts;
 logreader *logff;
 
 

Index: main.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/logcollector/main.c,v
diff -u -r1.16 -r1.17
--- main.c	9 Sep 2006 20:06:54 -0000	1.16
+++ main.c	10 Sep 2006 14:27:45 -0000	1.17
@@ -94,6 +94,9 @@
     loop_timeout = getDefine_Int("logcollector",
                                  "loop_timeout",
                                  1, 120);
+    
+    open_file_attempts = getDefine_Int("logcollector", "open_attempts",
+                                       2, 998);
             
     debug_flag = getDefine_Int("logcollector",
                                "debug",