Update subst regex to allow for colon in TZ

* Simplify subst regex as date-parser() allows for both `-08:00` and `-0800` TZ offsets
CSVD · Feb 14, 2020 · 600361c · 600361c
1 parent 3a2da35
commit 600361c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/package/etc/conf.d/log_paths/lp-fortinet_fortiweb.conf.tmpl b/package/etc/conf.d/log_paths/lp-fortinet_fortiweb.conf.tmpl
@@ -26,11 +26,10 @@ log {
     };
 
 # Fetch timezone from timezone nv pair and parse unique format (no zero padding, e.g. "-8:00" rather than "-08:00"
-# Reformat to "-0800"
+# Reformat to "-08:00"
     rewrite {
         subst('.*([\+-]\d+:\d+).*', $1, value(".kv.timezone"));
-        subst('([\+-])(\d)(?=:):(\d+)', "${1}0${2}${3}", value(".kv.timezone"));
-        subst('([\+-])(\d+):(\d+)', "$1$2$3", value(".kv.timezone"));
+        subst('([\+-])(\d)(?=:)(:\d+)', "${1}0${2}${3}", value(".kv.timezone"));
     };
 
     #2020-02-12,23:13:33-0800