Merge pull request #68 from soxft/master

fix: wrong uptime in lxc container
3 years ago · 41b9086b97
parent bc235eba31 669f008a8c
commit 41b9086b97
1 changed files with 6 additions and 3 deletions
--- a/class/core/system_api.py
+++ b/class/core/system_api.py
@ -250,9 +250,12 @@ class system_api:

    def getBootTime(self):
        # 取系统启动时间
-        start_time = psutil.boot_time()
-        run_time = time.time() - start_time
-        # conf = mw.readFile('/proc/uptime').split()
+        uptime = mw.readFile('/proc/uptime')
+        if uptime == False:
+            start_time = psutil.boot_time()
+            run_time = time.time() - start_time
+        else:
+            run_time = uptime.split()[0]
        tStr = float(run_time)
        min = tStr / 60
        hours = min / 60