Changeset 186 for trunk/src/sh_log_parse_apache.c

Timestamp:

Oct 31, 2008, 8:22:45 PM (16 years ago)

Author:

katerina

Message:

More fixes for log monitoring, and documentation update.

File:

• trunk/src/sh_log_parse_apache.c (modified) (9 diffs)

trunk/src/sh_log_parse_apache.c

@@ -47 +47 @@
   int    pos_status;
   int    pos_time;
-  int    format_time;
+  char * format_time;
 };
 
@@ -60 +60 @@
  */
 static void * sh_dummy_new = NULL;
+static void * sh_dummy_fti = NULL;
 
 void * sh_eval_fileinfo_apache(char * str)
@@ -75 +76 @@
   volatile int          p_status = -1;
   volatile int          p_time = -1;
-  volatile int          f_time = -1;
+  char                * f_time = NULL;
   const char * error;
   int          erroffset;
@@ -83 +84 @@
    */
   sh_dummy_new = (void*) &new;
+  sh_dummy_fti = (void*) &f_time;
 
   if (0 == strncmp("common", str, 6))
@@ -149 +151 @@
              strstr(token, _("{User-Agent}")) == 0)
             {
-              p = _("\"([^\"\\\\]*(?:\\\\.[^\"\\\\]*)*)\"");
+              /*
+              p = "\"([^\"\\\\]*(?:\\\\.[^\"\\\\]*)*)\"";
               sh_string_add_from_char(re_string, p);
+              */
+              sh_string_add_from_char(re_string, "\"([^");
+              sh_string_add_from_char(re_string, "\"\\\\");
+              sh_string_add_from_char(re_string, "]*");
+              sh_string_add_from_char(re_string, "(?:");
+              sh_string_add_from_char(re_string, "\\\\.");
+              sh_string_add_from_char(re_string, "[^\"");
+              sh_string_add_from_char(re_string, "\\\\]*");
+              sh_string_add_from_char(re_string, ")*)\"");
             }    
           else
             {
-              p = _("(\\S+)");
-              sh_string_add_from_char(re_string, p);
+              sh_string_add_from_char(re_string, "(");
+              sh_string_add_from_char(re_string, "\\S+");
+              sh_string_add_from_char(re_string, ")");
             }
         }
       else if (token[0] == '%' && token[strlen(token)-1] == 't') 
         {
-          p = _("\\[([^\\]]+)\\]");
+          char * lb = strchr(token, '{');
+          char * rb = strchr(token, '}');
+
+          sh_string_add_from_char(re_string, "\\[");
+          sh_string_add_from_char(re_string, "([^");
+          sh_string_add_from_char(re_string, "(\\]");
+          sh_string_add_from_char(re_string, "]+)");
+          sh_string_add_from_char(re_string, "\\]");
+
+          p_time = i+1;
+          if (lb && rb)
+            {
+              ++lb; *rb = '\0';
+              f_time = sh_util_strdup(lb);
+            }
+          else
+            {
+              f_time = sh_util_strdup(_("%d/%b/%Y:%T"));
+            }
+        }
+      else if (token[0] == '%' && token[1] == 'e' && 0 == strcmp(token, _("%error"))) 
+        {
+          sh_string_add_from_char(re_string, "\\[");
+          sh_string_add_from_char(re_string, "([^");
+          sh_string_add_from_char(re_string, "]");
+          sh_string_add_from_char(re_string, "]+)");
+          sh_string_add_from_char(re_string, "\\]");
+
+          p_time = i+1; f_time = sh_util_strdup(_("%a %b %d %T %Y")); ++i;
+          sh_string_add_from_char(re_string, " ");
+
+          sh_string_add_from_char(re_string, "\\[");
+          sh_string_add_from_char(re_string, "([^");
+          sh_string_add_from_char(re_string, "]");
+          sh_string_add_from_char(re_string, "]+)");
+          sh_string_add_from_char(re_string, "\\]");
+
+          p_status = i+1;
+          sh_string_add_from_char(re_string, " ");
+
+          p = "(.+)";
           sh_string_add_from_char(re_string, p);
-          p_time = i+1;
-          f_time = 1;
-        }
-      else if (token[0] == '%' && token[1] == 'e' && 0 == strcmp(token, _("%error"))) 
-        {
-          p = _("\\[([^\\]]+)\\]");
-          sh_string_add_from_char(re_string, p);
-          p_time = i+1; f_time = 2; ++i;
-
-          sh_string_add_from_char(re_string, " ");
-          p = _("\\[([^\\]]+)\\]");
-          sh_string_add_from_char(re_string, p);
-          p_status = i+1;
-
-          sh_string_add_from_char(re_string, " ");
-          p = _("(.*)");
-          sh_string_add_from_char(re_string, p);
+
+          nfields = 3;
 
           break;
@@ -184 +222 @@
       else
         {
-          p = _("(\\S+)");
-          sh_string_add_from_char(re_string, p);
+          sh_string_add_from_char(re_string, "(");
+          sh_string_add_from_char(re_string, "\\S+");
+          sh_string_add_from_char(re_string, ")");
           if (token[0] == '%' && token[strlen(token)-1] == 's')
             p_status = i+1;
@@ -288 +327 @@
           res = 0;
           timestamp = 0;
-          info->format_time = 1;
+          info->format_time = sh_util_strdup(_("%d/%b/%Y:%T"));
           sl_strlcpy(tstr, _("01/Jan/1970:00:00:00"), sizeof(tstr));
         }
@@ -295 +334 @@
         {
           struct tm btime;
-          char * ptr = NULL, * q;
+          char * ptr = NULL;
           
           /* example: 01/Jun/2008:07:55:28 +0200 */
 
-          if (info->format_time == 1)
-            {
-              q = strchr(tstr, ' ');
-              if (q) *q = '\0';
-              
-              ptr = /*@i@*/strptime(tstr, "%d/%b/%Y:%T", &btime);
-            }
-          else if (info->format_time == 2)
-            {
-              ptr = /*@i@*/strptime(tstr, "%a %b %d %T %Y", &btime);
-            }
-
-          if (ptr && *ptr == '\0')
+          ptr = /*@i@*/strptime(tstr, info->format_time, &btime);
+
+          if (ptr)
             {
               timestamp = conv_timestamp(&btime, &old_tm, &old_time);
@@ -349 +378 @@
       record->timestamp = timestamp;
       record->timestr   = sh_string_new_from_lchar(tstr, strlen(tstr));
-      record->prefix    = sh_string_new_from_lchar(sstr, strlen(sstr));
 
       if (hstr)