From f0bcf6df6ff9df8847c74cb70c3ef81bc82a662e Mon Sep 17 00:00:00 2001
From: Peter Dwyer <peter.dwyer@clanwilliamhealth.com>
Date: Wed, 31 Aug 2022 15:16:42 +0100
Subject: [PATCH] merging logger.py into base.py.

---
 cbreader/settings/base.py   | 54 ++++++++++++++++++++++++-
 cbreader/settings/logger.py | 78 -------------------------------------
 2 files changed, 53 insertions(+), 79 deletions(-)
 delete mode 100644 cbreader/settings/logger.py

diff --git a/cbreader/settings/base.py b/cbreader/settings/base.py
index aad04c3..1f833fe 100644
--- a/cbreader/settings/base.py
+++ b/cbreader/settings/base.py
@@ -119,7 +119,59 @@ UNRAR_TOOL = os.getenv("DJANGO_UNRAR_TOOL", None)
 
 COMIC_BOOK_VOLUME = Path(os.getenv("COMIC_BOOK_VOLUME", '/comics'))
 
-from .logger import LOGGING
+if DEBUG:
+    min_level = 'DEBUG'
+else:
+    min_level = 'INFO'
+
+min_django_level = 'INFO'
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,  # keep Django's default loggers
+    'formatters': {
+        # see full list of attributes here:
+        # https://docs.python.org/3/library/logging.html#logrecord-attributes
+        'verbose': {
+            'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+        },
+        'simple': {
+            'format': '%(levelname)s %(message)s'
+        },
+        'timestampthread': {
+            'format': "%(asctime)s [%(threadName)-12.12s] [%(levelname)-5.5s] [%(name)-20.20s]  %(message)s",
+        },
+    },
+    'handlers': {
+        'logfile': {
+            # optionally raise to INFO to not fill the log file too quickly
+            'level': min_level,  # this level or higher goes to the log file
+            'class': 'logging.handlers.RotatingFileHandler',
+            # IMPORTANT: replace with your desired logfile name!
+            'filename': os.path.join(BASE_DIR, 'djangoproject.log'),
+            'maxBytes': 50 * 10**6,  # will 50 MB do?
+            'backupCount': 3,  # keep this many extra historical files
+            'formatter': 'timestampthread'
+        },
+        'console': {
+            'level': min_level,  # this level or higher goes to the console
+            'class': 'logging.StreamHandler',
+        },
+    },
+    'loggers': {
+        'django': {  # configure all of Django's loggers
+            'handlers': ['logfile', 'console'],
+            'level': min_django_level,  # this level or higher goes to the console
+            'propagate': False,  # don't propagate further, to avoid duplication
+        },
+        # root configuration – for all of our own apps
+        # (feel free to do separate treatment for e.g. brokenapp vs. sth else)
+        '': {
+            'handlers': ['logfile', 'console'],
+            'level': min_level,  # this level or higher goes to the console,
+        },
+    },
+}
 
 SILK_ENABLED = False
 
diff --git a/cbreader/settings/logger.py b/cbreader/settings/logger.py
deleted file mode 100644
index 4fef563..0000000
--- a/cbreader/settings/logger.py
+++ /dev/null
@@ -1,78 +0,0 @@
-import os
-import logging
-
-from .base import BASE_DIR
-from .base import DEBUG
-
-# Usage in other modules:
-#
-#     from djangoproject.logger import log
-#     log.info('some output')
-#
-# Note, doing this manually in other modules results in nicer output:
-#
-#     import logging
-#     log = logging.getLogger(__name__)
-#     log.info('some output')
-
-# the basic logger other apps can import
-log = logging.getLogger(__name__)
-
-# the minimum reported level
-if DEBUG:
-    min_level = 'DEBUG'
-else:
-    min_level = 'INFO'
-
-# the minimum reported level for Django's modules
-# optionally set to DEBUG to see database queries etc.
-# or set to min_level to control it using the DEBUG flag
-min_django_level = 'INFO'
-
-# logging dictConfig configuration
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,  # keep Django's default loggers
-    'formatters': {
-        # see full list of attributes here:
-        # https://docs.python.org/3/library/logging.html#logrecord-attributes
-        'verbose': {
-            'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
-        },
-        'simple': {
-            'format': '%(levelname)s %(message)s'
-        },
-        'timestampthread': {
-            'format': "%(asctime)s [%(threadName)-12.12s] [%(levelname)-5.5s] [%(name)-20.20s]  %(message)s",
-        },
-    },
-    'handlers': {
-        'logfile': {
-            # optionally raise to INFO to not fill the log file too quickly
-            'level': min_level,  # this level or higher goes to the log file
-            'class': 'logging.handlers.RotatingFileHandler',
-            # IMPORTANT: replace with your desired logfile name!
-            'filename': os.path.join(BASE_DIR, 'djangoproject.log'),
-            'maxBytes': 50 * 10**6,  # will 50 MB do?
-            'backupCount': 3,  # keep this many extra historical files
-            'formatter': 'timestampthread'
-        },
-        'console': {
-            'level': min_level,  # this level or higher goes to the console
-            'class': 'logging.StreamHandler',
-        },
-    },
-    'loggers': {
-        'django': {  # configure all of Django's loggers
-            'handlers': ['logfile', 'console'],
-            'level': min_django_level,  # this level or higher goes to the console
-            'propagate': False,  # don't propagate further, to avoid duplication
-        },
-        # root configuration – for all of our own apps
-        # (feel free to do separate treatment for e.g. brokenapp vs. sth else)
-        '': {
-            'handlers': ['logfile', 'console'],
-            'level': min_level,  # this level or higher goes to the console,
-        },
-    },
-}
\ No newline at end of file