Nicely format time-until-expire

[tools.git] / tls-check

diff --git a/tls-check b/tls-check
index d8bdc9b2c18158281cde21b567029ff6d2a3a03c..3919e2e5ba79bf50287c95395919c71adcc1e99a 100644 (file)
--- a/tls-check
+++ b/tls-check
@@ -71,12 +71,13 @@ class Verifier:
     def check_cert(self, data, host, port, name):
         expiretimestamp = cert_time_to_seconds(data['notAfter'])
         delta = datetime.utcfromtimestamp(expiretimestamp) - datetime.utcnow()
+        deltastr = str(delta).split(",")
 
         if delta < self.crit:
-            print("CRIT (expires in %s) %s:%d" % (delta, name, port))
+            print("CRIT (expires in %8s,%16s) %s:%d" % (deltastr[0], deltastr[1], name, port))
             return 2
         elif delta < self.warn:
-            print("WARN (expires in %s) %s:%d" % (delta, name, port))
+            print("WARN (expires in %8s,%16s) %s:%d" % (deltastr[0], deltastr[1], name, port))
             return 1
 
 def main():