bugfixing & add smbd_journald

diff --git a/logparse/parsers/sysinfo.py b/logparse/parsers/sysinfo.py
index 6b89f82448bf84fe1ce5e92d7617a4263060cad7..7b44358a953605289e3ab041c7923c137fd128ab 100644 (file)
--- a/logparse/parsers/sysinfo.py
+++ b/logparse/parsers/sysinfo.py
@@ -8,6 +8,8 @@ import platform
 import subprocess
 import os
 import re
+from datetime import timedelta
+from multiprocessing import cpu_count
 
 from logparse.formatting import *
 from logparse.config import prefs
@@ -55,5 +57,16 @@ class Sysinfo(Parser):
         else:
             logger.warning("Failed to find processor data")
 
+        raw_uptime = util.readlog(prefs.get("logs", "uptime")).split("\n")[0]
+        logger.debug("Found uptime data " + str(raw_uptime))
+
+        uptime_total = float(raw_uptime.split()[0])
+        table.add_row(Row([Column("Uptime"), Column("%d d %d h %d m" % (uptime_total // 86400, uptime_total % 86400 // 3600, uptime_total % 3600 // 60))]))
+
+        idle_time = float(raw_uptime.split()[1]) / cpu_count()
+        m, s = divmod(idle_time, 60)
+        h, m = divmod(m, 60)
+        table.add_row(Row([Column("Idle time"), Column("%d d %d h %d m per core (avg)" % (idle_time // 86400, idle_time % 86400 // 3600, idle_time % 3600 // 60))]))
+
         logger.info("Finished sysinfo section")
         return section