logging: use ISO-like timestamp in file log

Also update suricata.yaml to show this default, as updating the
"default-log-format" does not affect the file output.

diff --git a/src/util-debug.h b/src/util-debug.h
index aab6c84d3d91f0249c65f4ea0f96ded6cb782750..167f9c2fa0165f5d77400b47ff691d99b9e52f46 100644 (file)
--- a/src/util-debug.h
+++ b/src/util-debug.h
@@ -74,7 +74,7 @@ typedef enum {
 } SCLogOPType;
 
 /* The default log_format, if it is not supplied by the user */
-#define SC_LOG_DEF_FILE_FORMAT      "[%i - %m] %t %d: %S: %M"
+#define SC_LOG_DEF_FILE_FORMAT      "[%i - %m] %z %d: %S: %M"
 #define SC_LOG_DEF_LOG_FORMAT_REL   "%D: %S: %M"
 #define SC_LOG_DEF_LOG_FORMAT_RELV  "%d: %S: %M"
 #define SC_LOG_DEF_LOG_FORMAT_RELVV "[%i] %d: %S: %M"

diff --git a/suricata.yaml.in b/suricata.yaml.in
index a2788d6a8a58ffface487f82627be7c57c7d913e..62df74e147df570e43bd2c290c5a348aa670e8f7 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -577,6 +577,7 @@ logging:
       enabled: yes
       level: info
       filename: suricata.log
+      # format: "[%i - %m] %z %d: %S: %M"
       # type: json
   - syslog:
       enabled: no