logging: support setting log dir

poller creates log files based on tree name. To move the logs
out of the nipa dir (e.g. to /var/logs/) we need the ability
to specify the log dir, but not the log file name.

Signed-off-by: Jakub Kicinski <[email protected]>

Author: kuba-moo

check_fetcher.py

@@ -34,8 +34,9 @@ def main():
     config = configparser.ConfigParser()
     config.read(['nipa.config', 'pw.config', 'checks.config'])
 
+    log_dir = config.get('log', 'dir', fallback=NIPA_DIR)
     log_init(config.get('log', 'type', fallback='org'),
-             config.get('log', 'file', fallback=os.path.join(NIPA_DIR, "checks.org")),
+             config.get('log', 'file', fallback=os.path.join(log_dir, "checks.org")),
              force_single_thread=True)
 
     rdir = config.get('dirs', 'results', fallback=os.path.join(NIPA_DIR, "results"))

core/tester.py

@@ -68,9 +68,10 @@ def run(self) -> None:
         self.config = configparser.ConfigParser()
         self.config.read(['nipa.config', 'pw.config', 'tester.config'])
 
+        log_dir = self.config.get('log', 'dir', fallback=core.NIPA_DIR)
         core.log_init(
             self.config.get('log', 'type', fallback='org'),
-            self.config.get('log', 'file', fallback=os.path.join(core.NIPA_DIR, f"{self.tree.name}.org")))
+            self.config.get('log', 'file', fallback=os.path.join(log_dir, f"{self.tree.name}.org")))
 
         core.log_open_sec("Tester init")
         if not os.path.exists(self.result_dir):

mailbot.py

@@ -697,8 +697,9 @@ def main():
     config = configparser.ConfigParser()
     config.read(['nipa.config', 'pw.config', 'mailbot.config'])
 
+    log_dir = config.get('log', 'dir', fallback=NIPA_DIR)
     log_init(config.get('log', 'type', fallback='org'),
-             config.get('log', 'file', fallback=os.path.join(NIPA_DIR, "mailbot.org")),
+             config.get('log', 'file', fallback=os.path.join(log_dir, "mailbot.org")),
              force_single_thread=True)
 
     pw = Patchwork(config)

pw_contest.py

@@ -295,8 +295,9 @@ def parse_configs():
 def main() -> None:
     config = parse_configs()
 
+    log_dir = config.get('log', 'dir', fallback=NIPA_DIR)
     log_init(config.get('log', 'type', fallback='org'),
-             config.get('log', 'file', fallback=os.path.join(NIPA_DIR, "contest.org")),
+             config.get('log', 'file', fallback=os.path.join(log_dir, "contest.org")),
              force_single_thread=True)
 
     pw = Patchwork(config)

pw_poller.py

@@ -242,8 +242,9 @@ def run(self, life) -> None:
     config = configparser.ConfigParser()
     config.read(['nipa.config', 'pw.config', 'poller.config'])
 
+    log_dir = config.get('log', 'dir', fallback=NIPA_DIR)
     log_init(config.get('log', 'type', fallback='org'),
-             config.get('log', 'file', fallback=os.path.join(NIPA_DIR, "poller.org")))
+             config.get('log', 'file', fallback=os.path.join(log_dir, "poller.org")))
 
     life = NipaLifetime(config)
     poller = PwPoller(config)

pw_upload.py

@@ -192,8 +192,9 @@ def main():
     config = configparser.ConfigParser()
     config.read(['nipa.config', 'pw.config', 'upload.config'])
 
+    log_dir = config.get('log', 'dir', fallback=NIPA_DIR)
     log_init(config.get('log', 'type', fallback='org'),
-             config.get('log', 'file', fallback=os.path.join(NIPA_DIR, "upload.org")),
+             config.get('log', 'file', fallback=os.path.join(log_dir, "upload.org")),
              force_single_thread=True)
 
     results_dir = config.get('results', 'dir', fallback=os.path.join(NIPA_DIR, "results"))