TMSS-139: rebased

SAS/TMSS/src/tmss/settings.py

@@ -14,6 +14,7 @@ import os
 import logging
 from lofar.common import dbcredentials, isDevelopmentEnvironment
 
+<<<<<<< HEAD
 logger = logging.getLogger(__name__)
 
 LOGGING = {
@@ -66,6 +67,17 @@ LOGGING = {
         },
     }
 }
+=======
+# logger
+logger = logging.getLogger(__name__)
+
+# fix/setup django_auth_ldap logging
+logging.getLogger('django_auth_ldap').addHandler(logging.StreamHandler())
+logging.getLogger('django_auth_ldap').setLevel(logging.INFO)
+
+# from pprint import pprint
+# pprint(dict(os.environ))
+>>>>>>> 5625d012ecffb971e8f8808fde16f35bfba34714
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -128,6 +140,10 @@ TEMPLATES = [
 ]
 
 WSGI_APPLICATION = 'lofar.sas.tmss.tmss.wsgi.application'
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5625d012ecffb971e8f8808fde16f35bfba34714
 
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
@@ -181,8 +197,6 @@ REST_FRAMEWORK = {
     ),
 }
 
-
-
 # AUTHENTICATION: simple LDAP, or OpenID
 if "OIDC_RP_CLIENT_ID" in os.environ.keys():