From 71a3683cc103de67bbb7f1d5422d51dcb81f6bc5 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Thu, 23 Apr 2020 17:20:51 +0200
Subject: [PATCH] Use logging in configloader (even if it doesn't show up)

---
 configloader.py | 24 +++++++++++++++++++-----
 worker.py       |  6 ------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/configloader.py b/configloader.py
index ad96b43..b6e6fba 100644
--- a/configloader.py
+++ b/configloader.py
@@ -1,9 +1,16 @@
 import sys
 import os
 import configparser
+import logging
+
+
+# Logs won't show up for this file as it is imported before logging is configured
+log = logging.getLogger(__name__)
+
 
 # Check if the config file exists, and create one if it doesn't
 if not os.path.isfile("config/config.ini"):
+    log.debug("Creating config.ini from template_config.ini")
     # Open the template file and create the config file
     with open("config/template_config.ini") as template_file, open("config/config.ini", "w") as config_file:
         # Copy the template file to the config file
@@ -14,27 +21,34 @@ with open("config/template_config.ini") as template_file:
     config = configparser.ConfigParser()
     config.read_file(template_file)
     template_version = int(config["Config"]["version"])
+    log.debug(f"Template is version {template_version}")
 
 # Overwrite the template config with the values in the config
 with open("config/config.ini") as config_file:
     config.read_file(config_file)
+    config_version = int(config["Config"]["version"])
+    log.debug(f"Config is version {template_version}")
 
 # Check if the file has been edited
 if config["Config"]["is_template"] == "yes":
-    print("A config file has been created in config/config.ini.\n"
-          "Edit it with your configuration, set the is_template flag to false and restart this script.")
+    log.debug("Config is a template, aborting...")
+    log.fatal("A config file has been created in config/config.ini.\n"
+              "Edit it with your configuration, set the is_template flag to 'no' and restart this script.")
     sys.exit(1)
 
 # Check if the version has changed from the template
-if template_version > int(config["Config"]["version"]):
+if template_version > config_version:
+    log.debug("Config is older than Template, trying to merge...")
     # Reset the is_template flag
     config["Config"]["is_template"] = "yes"
     # Update the config version
     config["Config"]["version"] = str(template_version)
     # Save the file
     with open("config/config.ini", "w") as config_file:
+        log.debug("Writing merged config file...")
         config.write(config_file)
     # Notify the user and quit
-    print("The config file in config/config.ini has been updated.\n"
-          "Edit it with the new required data, set the is_template flag to true and restart this script.")
+    log.debug("Config is now a template, aborting...")
+    log.fatal("The config file in config/config.ini has been updated.\n"
+              "Edit it with the new required data, set the is_template flag to true and restart this script.")
     sys.exit(1)
diff --git a/worker.py b/worker.py
index 2336f68..8839b2e 100644
--- a/worker.py
+++ b/worker.py
@@ -16,11 +16,6 @@ import requests
 import importlib
 import logging
 
-try:
-    import coloredlogs
-except ImportError:
-    coloredlogs = None
-
 log = logging.getLogger(__name__)
 
 language = configloader.config["Config"]["language"]
@@ -29,7 +24,6 @@ strings = importlib.import_module("strings." + language)
 
 class StopSignal:
     """A data class that should be sent to the worker when the conversation has to be stopped abnormally."""
-
     def __init__(self, reason: str = ""):
         self.reason = reason