„Logger.py“ ändern

2023-01-07 17:04:50 +00:00 · 2023-01-07 17:04:50 +00:00 · e96a85f67f
parent ffb1772a99
commit e96a85f67f
1 changed files with 46 additions and 32 deletions
--- a/Logger.py
+++ b/Logger.py
@ -1,32 +1,46 @@
-import machine
-import uos as os
-import TimeUtils
-
-class Logger():
-    def __init__(self, hk_days):
-        self.hk_days = hk_days
-        self.TimeUtils = TimeUtils.TimeUtils()
-        if not "logs" in os.listdir():
-            os.mkdir("/logs")            
-
-    def LogMessage(self, message):
-        print(message)
-        dt = machine.RTC().datetime()
-        file = open(("/logs/%04d-%02d-%02d.txt" % (dt[0], dt[1], dt[2])), "a")
-        file.write(self.TimeUtils.DateTimeNow() + ";" + message + "\n")
-        file.close()
-    
-    def Housekeeping(self):
-        for file in os.listdir("/logs"):
-            if (file.endswith(".txt")):
-                fd = file.split('.')[0].split('-')
-                if (self.TimeUtils.IsOlderThanDays(fd, self.hk_days)):
-                    os.remove("/logs/" + file)
-                    self.LogMessage("Housekeeping: deleted logfile " + file)
-
-    def LastLogs(self):
-        dt = machine.RTC().datetime()
-        file = open(("/logs/%04d-%02d-%02d.txt" % (dt[0], dt[1], dt[2])), "r")
-        lines = file.readlines()
-        file.close()
-        return "<br>".join(lines[-10:])
+import machine
+import uos as os
+import TimeUtils
+
+class Logger():
+    def __init__(self, hk_days):
+        self.hk_days = hk_days
+        self.TimeUtils = TimeUtils.TimeUtils()
+        if not "logs" in os.listdir():
+            os.mkdir("/logs")            
+
+    def LogMessage(self, message):
+        print(message)
+        dt = machine.RTC().datetime()
+        file = open(("/logs/%04d-%02d-%02d.txt" % (dt[0], dt[1], dt[2])), "a")
+        file.write(self.TimeUtils.DateTimeNow() + ";" + message + "\n")
+        file.close()
+    
+    def Housekeeping(self):
+        for file in os.listdir("/logs"):
+            if (file.endswith(".txt")):
+                fd = file.split('.')[0].split('-')
+                if (self.TimeUtils.IsOlderThanDays(fd, self.hk_days)):
+                    os.remove("/logs/" + file)
+                    self.LogMessage("Housekeeping: deleted logfile " + file)
+
+    def LastLogs(self, lines):
+        dt = machine.RTC().datetime()
+        logfilename = "/logs/%04d-%02d-%02d.txt" % (dt[0], dt[1], dt[2])
+        bufsize = 4096
+        fsize = os.stat(logfilename).st_size
+        iter = 0
+        logfile = open(logfilename, "r")
+        #lines = file.readlines()
+        if bufsize > fsize:
+            bufsize = fsize - 1
+            fetched_lines = []
+            while True:
+                iter += 1
+                logfile.seek(fsize-bufsize * iter)
+                fetched_lines.extend(logfile.readlines())
+                if len(fetched_lines) >= lines or logfile.tell() == 0:
+                    #print(''.join(fetched_lines[-N:]))
+                    break
+        file.close()
+        return "<br>".join(fetched_lines[-lines:])