Skip to contentSkip to conversation

Change timestamps in file-based logging to ISO 8601 time format.

PATCH In review Gert Doering 2 participants 3 messages Jun 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Change timestamps in file-based logging to ISO 8601 time format.

Replace existing ctime() output which is hard to sort and compare with ISO 8601 / RFC 3399 "YYYY-MM-DD hh:mm:dd" format for file-based logging (stderr or --log file).

RFC 3399 5.6 permits use of a space for full-date-full-time separation, which is used to enhance readability.

Sylog or --machine-readable-timestamps are not affected.

Trac: #719

---
 src/openvpn/otime.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
src/openvpn/otime.c +5 -2
index 759a7fb5..28683459 100644
@@ -127,8 +127,11 @@ time_string(time_t t, int usec, bool show_usec, struct gc_arena *gc)
     }
 
     t = tv.tv_sec;
-    buf_printf(&out, "%s", ctime(&t));
-    buf_rmtail(&out, '\n');
+    struct tm * tm = localtime(&t);
+
+    buf_printf(&out, "%04d-%02d-%02d %02d:%02d:%02d",
+                tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+                tm->tm_hour, tm->tm_min, tm->tm_sec);
 
     if (show_usec && tv.tv_usec)
     {
Signature · 1 line
2.26.2
Acked-by on v1 1/1
#1 lore raw

Am 20.06.20 um 19:23 schrieb Gert Doering:

Quoted 8 lines

Replace existing ctime() output which is hard to sort and compare with ISO 8601 / RFC 3399 "YYYY-MM-DD hh:mm:dd" format for file-based logging (stderr or --log file).

RFC 3399 5.6 permits use of a space for full-date-full-time separation, which is used to enhance readability.

Sylog or --machine-readable-timestamps are not affected.

you mean machine-readable-output?

Quoted 10 lines
---
 src/openvpn/otime.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
src/openvpn/otime.c +0 -0
index 759a7fb5..28683459 100644

src/openvpn/otime.c time_string(time_t t, int usec, bool show_usec, struct gc_arena *gc) · line 130

Quoted 6 lines
src/openvpn/otime.c +1 -2
@@ -127,8 +127,11 @@ time_string(time_t t, int usec, bool show_usec, struct gc_arena *gc)
     }
 
     t = tv.tv_sec;
-    buf_printf(&out, "%s", ctime(&t));
-    buf_rmtail(&out, '\n');
+    struct tm * tm = localtime(&t);

should be *tm

src/openvpn/otime.c time_string(time_t t, int usec, bool show_usec, struct gc_arena *gc) · line 137

Quoted 8 lines
src/openvpn/otime.c +4 -0
+
+    buf_printf(&out, "%04d-%02d-%02d %02d:%02d:%02d",
+                tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+                tm->tm_hour, tm->tm_min, tm->tm_sec);
 
     if (show_usec && tv.tv_usec)
     {
#2 lore raw
In reply to Gert Doering

Patch has been applied to the master branch.

I have corrected the commit message (yes, --machine-readable-output) and the "*tm" whitespacing.

commit ff063b6f19e035da56fbf49c891e6376543b391d

Author: Gert Doering
Date:   Sat Jun 20 19:23:03 2020 +0200
     Change timestamps in file-based logging to ISO 8601 time format.

     Signed-off-by: Gert Doering <[email protected]...>
     Acked-by: Arne Schwabe <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg20040.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering