add option to specify logging timestamp format

README.md

@@ -42,7 +42,8 @@ with built-in log rotation.
 
 `socklog-overlay` works by reading in a series of `s6-log` logging scripts from
 `/etc/socklog.rules`. You can create your own rules by placing a file in
-`/etc/socklog.rules`.
+`/etc/socklog.rules`. Each directive (selection directive, control directive,
+or action directive) for the logging script should be on its own line.
 
 For example, if you wanted to save all errors for messages tagged with the
 "local0" facility, you could create the file `/etc/socklog.rules/local0-error`
@@ -79,7 +80,15 @@ Create a script in `/etc/cont-init.d` to make your needed logging folder,
 if it's a subfolder of `/var/log/socklog`, you should be covered. If not,
 you'll likely need to chown it as well, to the `nobody` user.
 
-Ideas I'd like to flesh out:
+### Environment variables
+
+* `SOCKLOG_TIMESTAMP_FORMAT` - controls how (or if) a timestamp should be placed
+before every line, defaults to `T`
+  * (empty) - do not insert timestamps into logs
+  * `T` - prepend every line with an ISO 8601 timestamp
+  * `t` - prepend every line with a TAI64N timestamp
+
+## Ideas I'd like to flesh out:
 
 * Setting an environment variable to specify number of files, size, etc
   * Right now this is just using the `s6-log` defaults - 10 files, ~100k per file

overlay-rootfs/etc/cont-init.d/~-socklog

@@ -1,5 +1,27 @@
 #!/usr/bin/execlineb
 
+backtick -D "T" -n SOCKLOG_TIMESTAMP_FORMAT { printcontenv SOCKLOG_TIMESTAMP_FORMAT }
+importas -u SOCKLOG_TIMESTAMP_FORMAT SOCKLOG_TIMESTAMP_FORMAT
+
+# make sure SOCKLOG_TIMESTAMP_FORMAT is acceptable
+if
+{
+  ifelse { s6-test -n "${SOCKLOG_TIMESTAMP_FORMAT}" }
+  {
+      ifelse { s6-test "${SOCKLOG_TIMESTAMP_FORMAT}" != "T" }
+      {
+        ifelse { s6-test "${SOCKLOG_TIMESTAMP_FORMAT}" != "t" }
+        {
+            redirfd -wb 1 /var/run/s6/container_environment/SOCKLOG_TIMESTAMP_FORMAT
+            s6-echo -n -- T
+        }
+        exit 0
+      }
+      exit 0
+  }
+  exit 0
+}
+
 if { s6-mkdir -p -m 0750 /var/log/socklog/cron }
 if { s6-mkdir -p -m 0750 /var/log/socklog/daemon }
 if { s6-mkdir -p -m 0750 /var/log/socklog/debug }

overlay-rootfs/etc/services.d/socklog/log/run

@@ -1,5 +1,7 @@
 #!/usr/bin/execlineb -P
 
+backtick -D "T" -n SOCKLOG_TIMESTAMP_FORMAT { printcontenv SOCKLOG_TIMESTAMP_FORMAT }
+
 backtick -i -n LOGGING_SCRIPT
 {
   pipeline { pipeline { s6-ls -0 -- /etc/socklog.rules } s6-sort -0 }
@@ -11,7 +13,9 @@ backtick -i -n LOGGING_SCRIPT
   } s6-echo
 }
 
-importas -C -u -s LOGGING_SCRIPT LOGGING_SCRIPT
+importas -C -u -s -d"\r\n" LOGGING_SCRIPT LOGGING_SCRIPT
+importas -C -u -s -d"\r\n" SOCKLOG_TIMESTAMP_FORMAT SOCKLOG_TIMESTAMP_FORMAT
 
 s6-setuidgid nobody
 s6-log -bp $LOGGING_SCRIPT
+

overlay-rootfs/etc/socklog.rules/~-cron

@@ -1,4 +1,4 @@
 -
 +^cron\.
-T
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/cron

overlay-rootfs/etc/socklog.rules/~-daemon

@@ -1,4 +1,4 @@
 -
 +^daemon\.
-T
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/daemon

overlay-rootfs/etc/socklog.rules/~-debug

@@ -1,3 +1,4 @@
 -
 +^\.debug:
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/debug

overlay-rootfs/etc/socklog.rules/~-errors

@@ -4,5 +4,5 @@
 +\.emerg:
 +\.alert:
 +\.crit:
-T
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/errors

overlay-rootfs/etc/socklog.rules/~-everything

@@ -1,5 +1,5 @@
 +
 -auth\.
 -authpriv\.
-T
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/everything

overlay-rootfs/etc/socklog.rules/~-kernel

@@ -1,4 +1,4 @@
 -
 +^kern\.
-T
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/kernel

overlay-rootfs/etc/socklog.rules/~-mail

@@ -1,4 +1,4 @@
 -
 +^mail\.
-T
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/mail

overlay-rootfs/etc/socklog.rules/~-messages

@@ -7,5 +7,5 @@
 -^mail\.
 -^news\.
 -^cron\.
-T
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/messages

overlay-rootfs/etc/socklog.rules/~-secure

@@ -1,5 +1,5 @@
 -
 +^auth\.
 +^authpriv\.
-T
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/secure

overlay-rootfs/etc/socklog.rules/~-user

@@ -1,4 +1,4 @@
 -
 +^user\.
-T
+${SOCKLOG_TIMESTAMP_FORMAT}
 /var/log/socklog/user