make use of the newer format for dates

tonyseek · Sep 19, 2023 · 686b424 · 686b424
1 parent 6eb97d1
commit 686b424
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/openvpn_status/utils.py b/openvpn_status/utils.py
@@ -10,6 +10,7 @@
 from netaddr import EUI, mac_unix
 
 
+DATETIME_FORMAT_OPENVPN_OLD = u'%Y-%m-%d %H:%M:%S'
 DATETIME_FORMAT_OPENVPN = u'%a %b %d %H:%M:%S %Y'
 RE_VIRTUAL_ADDR_MAC = re.compile(
     u'^{0}:{0}:{0}:{0}:{0}:{0}$'.format(u'[a-f0-9]{2}'), re.I)
@@ -21,7 +22,11 @@ def parse_time(time):
     """Parses date and time from input string in OpenVPN logging format."""
     if isinstance(time, datetime.datetime):
         return time
-    return datetime.datetime.strptime(time, DATETIME_FORMAT_OPENVPN)
+    try:
+        # firs use the newer format
+        return datetime.datetime.strptime(time, DATETIME_FORMAT_OPENVPN)
+    except:
+        return datetime.datetime.strptime(time, DATETIME_FORMAT_OPENVPN_OLD)
 
 
 def parse_peer(peer):