From 4d377851a3cd5de0d102ca665366688a3f199185 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 25 Mar 2021 15:10:12 -0700 Subject: [PATCH] remove cython dependency in swaglog --- selfdrive/swaglog.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/selfdrive/swaglog.py b/selfdrive/swaglog.py index beacd5b8..08122b0c 100644 --- a/selfdrive/swaglog.py +++ b/selfdrive/swaglog.py @@ -1,12 +1,12 @@ -import os -from pathlib import Path import logging +import os +import time +from pathlib import Path from logging.handlers import BaseRotatingHandler import zmq from common.logging_extra import SwagLogger, SwagFormatter, SwagLogFileFormatter -from common.realtime import sec_since_boot from selfdrive.hardware import PC if PC: @@ -34,7 +34,7 @@ class SwaglogRotatingFileHandler(BaseRotatingHandler): self.doRollover() def _open(self): - self.last_rollover = sec_since_boot() + self.last_rollover = time.monotonic() self.last_file_idx += 1 next_filename = f"{self.base_filename}.{self.last_file_idx:010}" stream = open(next_filename, self.mode, encoding=self.encoding) @@ -52,7 +52,7 @@ class SwaglogRotatingFileHandler(BaseRotatingHandler): def shouldRollover(self, record): size_exceeded = self.max_bytes > 0 and self.stream.tell() >= self.max_bytes - time_exceeded = self.interval > 0 and self.last_rollover + self.interval <= sec_since_boot() + time_exceeded = self.interval > 0 and self.last_rollover + self.interval <= time.monotonic() return size_exceeded or time_exceeded def doRollover(self):