From ac2e8ee44bb86859bac66aff6534e51901cf0756 Mon Sep 17 00:00:00 2001
From: Alexandr Bogomyakov <ab@hexor.cy>
Date: Sat, 16 Mar 2024 04:29:49 +0200
Subject: [PATCH] Send logs to sync.log

---
 lib.py  | 10 +++++++---
 main.py | 34 +++++++++++++++++++++-------------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/lib.py b/lib.py
index cdbf006..48eab65 100644
--- a/lib.py
+++ b/lib.py
@@ -56,9 +56,13 @@ class Server:
             "keys": self.client.get_keys(),
         }
         self.log = logging.getLogger(f'OutFleet.server[{self.data["name"]}]')
-#       self.log.info(f"KEY ON {self.data['name']} {self.data['keys'][0]}")
-#       for key in self.data['keys']:
-#           print(key)
+        file_handler = logging.FileHandler("sync.log")
+        file_handler.setLevel(logging.DEBUG)
+        formatter = logging.Formatter(
+            "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+        )
+        file_handler.setFormatter(formatter)
+        self.log.addHandler(file_handler)
 
     def info(self) -> ServerDict:
         return self.data
diff --git a/main.py b/main.py
index d668582..1906150 100644
--- a/main.py
+++ b/main.py
@@ -11,6 +11,22 @@ from flask_cors import CORS
 from lib import Server
 
 logging.getLogger("werkzeug").setLevel(logging.ERROR)
+
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+    datefmt="%d-%m-%Y %H:%M:%S",
+)
+
+log = logging.getLogger("OutFleet")
+file_handler = logging.FileHandler("sync.log")
+file_handler.setLevel(logging.DEBUG)
+formatter = logging.Formatter(
+    "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+file_handler.setFormatter(formatter)
+log.addHandler(file_handler)
+
 parser = argparse.ArgumentParser()
 parser.add_argument(
     "-c",
@@ -21,14 +37,6 @@ parser.add_argument(
 args = parser.parse_args()
 CFG_PATH = args.config
 
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-    datefmt="%d-%m-%Y %H:%M:%S",
-)
-
-log = logging.getLogger("OutFleet")
-
 SERVERS = list()
 CLIENTS = dict()
 VERSION = '2'
@@ -382,11 +390,6 @@ def sync():
         )
     if request.method == "POST":
         log = logging.getLogger("sync")
-        if request.form.get("wipe") == 'all':
-            for server in SERVERS:
-                log.info("Wiping all keys on [%s]", server.data["name"])
-                for client in server.data['keys']:
-                    server.delete_key(client.key_id)
         file_handler = logging.FileHandler("sync.log")
         file_handler.setLevel(logging.DEBUG)
         formatter = logging.Formatter(
@@ -394,6 +397,11 @@ def sync():
         )
         file_handler.setFormatter(formatter)
         log.addHandler(file_handler)
+        if request.form.get("wipe") == 'all':
+            for server in SERVERS:
+                log.info("Wiping all keys on [%s]", server.data["name"])
+                for client in server.data['keys']:
+                    server.delete_key(client.key_id)
 
         server_hash = {}
         for server in SERVERS: