Fix log lvls, default to debug 4 cli usage

Disable debug in production using environment variable in SystemD
service

3 files changed, 33 insertions, 40 deletions

diff --git a/blog.node5.net.service b/blog.node5.net.service
index 24298bf..93764fe 100644
--- a/blog.node5.net.service
+++ b/blog.node5.net.service
@@ -7,8 +7,9 @@ User=blog
 Group=www-data
 WorkingDirectory=/opt/blog.node5.net_flask
 Environment="PATH=/opt/blog.node5.net_flask/venv/bin"
+Environment="PROD=1"
 ExecStart=/opt/blog.node5.net_flask/venv/bin/uwsgi --ini uwsgi.ini
 ExecReload=/usr/bin/kill -1 $MAINPID
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/src/blog_node5_net.py b/src/blog_node5_net.py
index 0b7b3de..da2ef84 100644
--- a/src/blog_node5_net.py
+++ b/src/blog_node5_net.py
@@ -11,14 +11,43 @@ import markdown
 import markupsafe
 import yaml
 
-import log
 import article
 import db_handler
 import telegram_handler
 
 
-logger = logging.getLogger(__name__) # Set the logger name, to the name of the module
+class CustomFormatter(logging.Formatter):
+    grey = "\x1b[90;20m"
+    blue = "\x1b[34;20m"
+    yellow = "\x1b[33;20m"
+    red = "\x1b[31;20m"
+    bold_red = "\x1b[31;1m"
+    reset = "\x1b[0m"
+    format = "%(asctime)s,%(msecs)03d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s"
+
+    FORMATS = {
+        logging.DEBUG: grey + format + reset,
+        logging.INFO: blue + format + reset,
+        logging.WARNING: yellow + format + reset,
+        logging.ERROR: red + format + reset,
+        logging.CRITICAL: bold_red + format + reset
+    }
+
+    def format(self, record):
+        log_fmt = self.FORMATS.get(record.levelno)
+        formatter = logging.Formatter(log_fmt)
+        return formatter.format(record)
+
+
+logger = logging.getLogger(__name__)
+debug = 'PROD' not in os.environ
+logger.setLevel(logging.DEBUG if debug else logging.WARNING)
+logging.getLogger('werkzeug').setLevel(logging.DEBUG if debug else logging.WARNING)
 
+stream_handler = logging.StreamHandler()
+stream_handler.setFormatter(CustomFormatter())
+logger.root.addHandler(stream_handler)
+logger.info(f"Debug: {'en' if debug else 'dis'}abled")
 
 with open(os.path.join('configs', 'config.yml'), 'r') as file:
     config = yaml.safe_load(file.read())
diff --git a/src/log.py b/src/log.py
deleted file mode 100644
index 9e1b0a6..0000000
--- a/src/log.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import os
-import logging
-
-
-class CustomFormatter(logging.Formatter):
-    grey = "\x1b[90;20m"
-    blue = "\x1b[34;20m"
-    yellow = "\x1b[33;20m"
-    red = "\x1b[31;20m"
-    bold_red = "\x1b[31;1m"
-    reset = "\x1b[0m"
-    format = "%(asctime)s,%(msecs)03d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s"
-
-    FORMATS = {
-        logging.DEBUG: grey + format + reset,
-        logging.INFO: blue + format + reset,
-        logging.WARNING: yellow + format + reset,
-        logging.ERROR: red + format + reset,
-        logging.CRITICAL: bold_red + format + reset
-    }
-
-    def format(self, record):
-        log_fmt = self.FORMATS.get(record.levelno)
-        formatter = logging.Formatter(log_fmt)
-        return formatter.format(record)
-
-
-logger = logging.getLogger(__name__)
-debug = os.environ.get('FLASK_DEBUG') == '1'
-logger.setLevel(logging.DEBUG if debug else logging.WARNING)
-logging.getLogger('werkzeug').setLevel(logging.DEBUG if debug else logging.WARNING)
-
-stream_handler = logging.StreamHandler()
-stream_handler.setFormatter(CustomFormatter())
-logger.root.addHandler(stream_handler)
-logger.info(f"Debug: {'en' if debug else 'dis'}abled")
-