From 96032602c0e33dc06e66a4c12a049e430deb30fa Mon Sep 17 00:00:00 2001
From: cinnaboot <cinnaboot@protonmail.com>
Date: Wed, 23 Oct 2019 04:27:24 -0400
Subject: [PATCH] update flask logging to use custom formatting

---
 video_metadata/__init__.py |  8 ++++++--
 video_metadata/util.py     | 14 +++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/video_metadata/__init__.py b/video_metadata/__init__.py
index c1ca90b..ab396b1 100644
--- a/video_metadata/__init__.py
+++ b/video_metadata/__init__.py
@@ -3,6 +3,8 @@ import os
 
 from flask import Flask, render_template
 
+from . import util
+
 
 class default_config(object):
     def __init__(self, app):
@@ -26,13 +28,15 @@ def create_app():
     app.jinja_env.lstrip_blocks = True
     app.config.from_object(default_config(app))
 
+    # add local config changes
+    app.config.from_pyfile('local_config.py')
+
     # TEMPLATES_AUTO_RELOAD wasn't working with uwsgi
     #   https://github.com/pallets/flask/issues/1907#issuecomment-471320980
     if app.config['DEBUG'] == True:
         app.jinja_env.auto_reload = True
 
-    # add local config changes
-    app.config.from_pyfile('local_config.py')
+    app.logger = util.getLogger(app.config['DEBUG'])
 
     from . import db
     db.init_app(app)
diff --git a/video_metadata/util.py b/video_metadata/util.py
index 680ec21..63afc20 100644
--- a/video_metadata/util.py
+++ b/video_metadata/util.py
@@ -5,19 +5,23 @@ import yaml
 
 
 def getLogger(is_debug):
+    logger = logging.getLogger(__name__)
+    handler = logging.StreamHandler(sys.stdout)
+
     if (is_debug):
         logging.basicConfig(level=logging.DEBUG)
+        handler.setLevel(logging.DEBUG)
+    else:
+        logging.basicConfig(level=logging.INFO)
+        handler.setLevel(logging.INFO)
 
-    logger = logging.getLogger(__name__)
     formatter = logging.Formatter(
-        fmt='%(asctime)s, %(levelname)-5s [%(filename)s:%(lineno)d, %(funcName)s] %(message)s'
+        fmt='%(asctime)s, %(levelname)-7s [%(filename)s:%(lineno)d, %(funcName)s] %(message)s'
     )
-    handler = logging.StreamHandler(sys.stdout)
-    handler.setLevel(logging.DEBUG)
+
     handler.setFormatter(formatter)
     logger.propagate = False
     logger.addHandler(handler)
-
     return logger