[log format] generic prefix len

src/log_format.cc

@@ -244,6 +244,7 @@ char *log_format::log_scanf(const char *line,
 
                     this->lf_fmt_lock      = curr_fmt;
                     this->lf_time_fmt_lock = curr_time_fmt;
+                    this->lf_time_fmt_len  = retval - time_dest;
 
                     found = true;
                     break;

src/log_format.hh

@@ -276,13 +276,15 @@ public:
         };
     };
 
-    log_format() : lf_fmt_lock(-1), lf_time_fmt_lock(-1) { };
+    log_format() : lf_fmt_lock(-1), lf_time_fmt_lock(-1), lf_time_fmt_len(-1) {
+    };
     virtual ~log_format() { };
 
     virtual void clear(void)
     {
         this->lf_fmt_lock      = -1;
         this->lf_time_fmt_lock = -1;
+        this->lf_time_fmt_len = -1;
     };
 
     /**
@@ -337,6 +339,7 @@ protected:
 
     int lf_fmt_lock;
     int lf_time_fmt_lock;
+    int lf_time_fmt_len;
 };
 
 /**

src/log_format_impls.cc

@@ -571,7 +571,7 @@ class generic_log_format : public log_format {
         sscanf(line.c_str(), fmt, timestr, level, &prefix_len);
 
         lr.lr_start = fmt[0] == '%' ? 0 : 1;
-        lr.lr_end   = lr.lr_start + strlen(timestr);
+        lr.lr_end   = lr.lr_start + this->lf_time_fmt_len;
         sa[lr].insert(make_string_attr("timestamp", 0));
 
         for (int lpc = 0; level[lpc]; lpc++) {
@@ -583,7 +583,7 @@ class generic_log_format : public log_format {
         }
 
         if (logline::string2level(level, true) == logline::LEVEL_UNKNOWN) {
-            prefix_len = strlen(timestr);
+            prefix_len = lr.lr_end;
         }
 
         lr.lr_start = 0;