Fixed some deploy templates and settings.

[redakcja.git] / redakcja / settings / common.py

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 24a4258..377a4d5 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os.path
 
 # -*- coding: utf-8 -*-
 import os.path
 

-PROJECT_ROOT = os.path.realpath(os.path.dirname(__file__))
+PROJECT_ROOT = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))

 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG


@@ -140,3 +140,16 @@ WL_API_CONFIG = {
 }
 
 # Import localsettings file, which may override settings defined here
 }
 
 # Import localsettings file, which may override settings defined here

+
+from localsettings import *
+
+try:
+    import logging
+    if os.path.isfile(LOGGING_CONFIG_FILE):
+        import logging.config
+        logging.config.fileConfig(LOGGING_CONFIG_FILE)
+    else:
+        import sys
+        logging.basicConfig(stream=sys.stderr)
+except ImportError as exc:
+    raise