Merge pull request catchpoint#640 from HTTPArchive/logging

Logging fixes
HTTPArchive · Sep 27, 2023 · 465638a · 465638a
2 parents 075ca79 + ca301f1
commit 465638a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ubuntu_install.sh b/ubuntu_install.sh
@@ -29,7 +29,7 @@ sudo dbus-uuidgen --ensure
 sudo fc-cache -f -v
 
 # Install the python modules
-until sudo pip3 install dnspython monotonic pillow psutil requests tornado wsaccel brotli fonttools selenium future usbmuxwrapper
+until sudo pip3 install dnspython monotonic pillow psutil requests tornado wsaccel brotli fonttools selenium future usbmuxwrapper pytz tzlocal
 do
     sleep 1
 done

diff --git a/wptagent.py b/wptagent.py
@@ -8,7 +8,6 @@
 import atexit
 import logging
 import logging.handlers
-from internal.rfc5424logging import Rfc5424SysLogHandler, logging_context
 import os
 import platform
 import gzip
@@ -490,6 +489,8 @@ def startup(self, detected_browsers):
 
         # Optional imports
         self.requires('fontTools', 'fonttools')
+        self.requires('pytz')
+        self.requires('tzlocal')
 
         # Try patching ws4py with a faster lib
         try:
@@ -1091,6 +1092,7 @@ def setup_logging(verbosity=0, log_format=None, log_file=None):
             logging.getLogger().addHandler(err_log)
     else:
         if log_format == "syslog" and log_file is not None:
+            from internal.rfc5424logging import Rfc5424SysLogHandler, logging_context
             logger = logging.getLogger()
             logger.setLevel(basic_log_level)
             handler = Rfc5424SysLogHandler( \