diff --git a/selfdrive/loggerd/tests/test_uploader.py b/selfdrive/loggerd/tests/test_uploader.py index 4a44f80b5..8ebb001c7 100644 --- a/selfdrive/loggerd/tests/test_uploader.py +++ b/selfdrive/loggerd/tests/test_uploader.py @@ -11,6 +11,7 @@ from common.xattr import getxattr from selfdrive.loggerd.tests.loggerd_tests_common import UploaderTestCase + class TestLogHandler(logging.Handler): def __init__(self): logging.Handler.__init__(self) @@ -22,7 +23,7 @@ class TestLogHandler(logging.Handler): def emit(self, record): try: - j = json.loads(record.message) + j = json.loads(record.getMessage()) if j["event"] == "upload_success": self.upload_order.append(j["key"]) if j["event"] == "upload_ignored": @@ -33,6 +34,7 @@ class TestLogHandler(logging.Handler): log_handler = TestLogHandler() cloudlog.addHandler(log_handler) + class TestUploader(UploaderTestCase): def setUp(self): super(TestUploader, self).setUp() diff --git a/selfdrive/manager/manager.py b/selfdrive/manager/manager.py index af0340af2..6c71c2a37 100755 --- a/selfdrive/manager/manager.py +++ b/selfdrive/manager/manager.py @@ -149,9 +149,10 @@ def manager_thread(): started_prev = started - running_list = ["%s%s\u001b[0m" % ("\u001b[32m" if p.proc.is_alive() else "\u001b[31m", p.name) - for p in managed_processes.values() if p.proc] - cloudlog.debug(' '.join(running_list)) + running = ' '.join(["%s%s\u001b[0m" % ("\u001b[32m" if p.proc.is_alive() else "\u001b[31m", p.name) + for p in managed_processes.values() if p.proc]) + print(running) + cloudlog.debug(running) # send managerState msg = messaging.new_message('managerState') diff --git a/selfdrive/swaglog.py b/selfdrive/swaglog.py index 08122b0ca..a987bfe72 100644 --- a/selfdrive/swaglog.py +++ b/selfdrive/swaglog.py @@ -106,7 +106,17 @@ def add_file_handler(log): cloudlog = log = SwagLogger() log.setLevel(logging.DEBUG) + outhandler = logging.StreamHandler() + +print_level = os.environ.get('LOGPRINT', 'warning') +if print_level == 'debug': + outhandler.setLevel(logging.DEBUG) +elif print_level == 'info': + outhandler.setLevel(logging.INFO) +elif print_level == 'warning': + outhandler.setLevel(logging.WARNING) + log.addHandler(outhandler) # logs are sent through IPC before writing to disk to prevent disk I/O blocking log.addHandler(UnixDomainSocketHandler(SwagFormatter(log)))