Merge 0b4c660 into 6d8e4ad

Pipfile

@@ -15,7 +15,7 @@ django-filter = "*"
 djangorestframework = "*"
 factory-boy = "*"
 filemagic = "*"
-fuzzywuzzy = {extras = ["speedup"], version = "==0.15.0"}
+fuzzywuzzy = {extras = ["speedup"],version = "==0.15.0"}
 gunicorn = "*"
 inotify-simple = "*"
 langdetect = "*"
@@ -36,6 +36,7 @@ pytest-env = "*"
 pytest-xdist = "*"
 psycopg2 = "*"
 djangoql = "*"
+pyyaml = "*"
 
 [dev-packages]
 ipython = "*"

src/paperless/settings.py

@@ -11,15 +11,20 @@
 """
 
 import os
+import yaml
 
 from dotenv import load_dotenv
 
 
 # Tap paperless.conf if it's available
 if os.path.exists("/etc/paperless.conf"):
     load_dotenv("/etc/paperless.conf")
+elif os.path.exists("/etc/paperless/paperless.conf"):
+    load_dotenv("/etc/paperless/paperless.conf")
 elif os.path.exists("/usr/local/etc/paperless.conf"):
     load_dotenv("/usr/local/etc/paperless.conf")
+elif os.path.exists("/usr/local/etc/paperless/paperless.conf"):
+    load_dotenv("/usr/local/etc/paperless/paperless.conf")
 
 
 def __get_boolean(key, default="NO"):
@@ -222,18 +227,32 @@ def __get_boolean(key, default="NO"):
 
 # Logging
 
-LOGGING = {
-    "version": 1,
-    "disable_existing_loggers": False,
-    "handlers": {
-        "consumer": {
-            "class": "documents.loggers.PaperlessLogger",
-        }
-    },
-    "loggers": {
-        "documents": {
-            "handlers": ["consumer"],
-            "level": os.getenv("PAPERLESS_CONSUMER_LOG_LEVEL", "INFO"),
+# Django use the python dictConfig format for logging. For more info See:
+#  * https://docs.djangoproject.com/en/2.1/topics/logging/
+#  * https://docs.python.org/3/library/logging.config.html#logging-config-dictschema
+#
+# Removing the default logging configuration will disable logging into the database
+# and the log view from the interface
+
+if os.path.exists("/etc/paperless/logging.yml"):
+    with open("/etc/paperless/logging.yml", 'r') as config:
+        LOGGING = yaml.load(config)
+elif os.path.exists("/usr/local/etc/paperless/logging.yml"):
+    with open("/usr/local/etc/paperless/logging.yml", 'r') as config:
+        LOGGING = yaml.load(config)
+else:
+    LOGGING = {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "handlers": {
+            "consumer": {
+                "class": "documents.loggers.PaperlessLogger",
+            }
+        },
+        "loggers": {
+            "documents": {
+                "handlers": ["consumer"],
+                "level": os.getenv("PAPERLESS_CONSUMER_LOG_LEVEL", "INFO"),
         },
     },
 }