POC Campus Condorcet : logging, premier essai

django/sp_sso/saml/utils.py

@@ -3,7 +3,6 @@ import json
 import logging
 
 from urllib2 import build_opener, HTTPHandler, Request, HTTPError
-from django.conf import settings
 from django.utils.translation import ugettext as _
 
 rootdn = 'dc=condorcet,dc=dev,dc=entrouvert,dc=org'
@@ -16,7 +15,7 @@ pocform = 'traitement_supann'
 wcs = 'http://forms-condorcet.dev.entrouvert.org/'
 posturl = wcs+'/api/formdefs/'+pocform+'/submit'
 
-logger = logging.getLogger(settings.LOGGER)
+logger = logging.getLogger('django')
 
 sso_attributes = ['prenom',
                   'nom',
@@ -47,7 +46,7 @@ def ldap_init():
         l = ldap.open(server)
         l.simple_bind(who, cred)
     except ldap.LDAPError:
-        logger.error(_('Error while binding to the OpenLDAP server.'))
+        logger.error('Error while binding to the OpenLDAP server.')
         l = None
     return l
 # Used to fill the choices in hote_etablissemnt form ChoiceField:
@@ -133,7 +132,7 @@ def wcs_submit(id):
     try:
         opener.open(req)
     except HTTPError, e:
-        logger.error(_('HTTP error ')+ str(e.code) +_('during WCS form submission'))
+        logger.error('HTTP error '+ str(e.code) +'during WCS form submission')
         ret = -1
 
     return ret

django/sp_sso/saml/views.py

@@ -1,3 +1,4 @@
+import logging
 from django.views.generic import FormView
 from django.shortcuts import render
 from django.utils.translation import ugettext as _
@@ -6,6 +7,7 @@ from .forms import RegistrationForm
 from .utils import ldap_contains_user, wcs_submit, \
                    sso_attributes, craft_user_nickname
 
+logger = logging.getLogger('django')
 
 # TODOs
 #   export global config variables in settings.py
@@ -25,11 +27,13 @@ wcs_multiple_fields = ['s_entite_affectation',
                        'ep_affiliation']
 
 def usernone(request):
+    logger.info(u'User %s already registered to the LDAP user branch.', request.user)
     message = _("Your account has already been registered to the Campus Condorcet account base.")
     template = 'simple_message.html'
     return render(request, template, {'message' : message})
 
 def wcs_post(request):
+    logger.info(u'Processing request %s',  request)
     return render(request, 'simple_message.html',
             {'message':_("Your account creation request has been sent.")})
 

django/sp_sso/sp_sso/settings.py

@@ -15,22 +15,17 @@ from django.conf import global_settings
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
-LOGGER = 'SP SSO'
 
 # Logger config copied from the authentic2 project settings:
 LOGGING_CONFIG = None
 LOGGING = {
     'version': 1,
-    'disable_existing_loggers': True,
+    'disable_existing_loggers': False,
     'formatters': {
         'verbose': {
             'format': '[%(asctime)s] %(ip)s %(user)s %(request_id)s %(levelname)s %(name)s.%(funcName)s: %(message)s',
             'datefmt': '%Y-%m-%d %a %H:%M:%S'
         },
-        'verbose_db': {
-            'format': '[%(asctime)s] - - - %(levelname)s %(name)s.%(funcName)s: %(message)s',
-            'datefmt': '%Y-%m-%d %a %H:%M:%S'
-        },
     },
     'handlers': {
         'console': {
@@ -38,14 +33,7 @@ LOGGING = {
             'class':'logging.StreamHandler',
             'formatter': 'verbose',
             'filters': ['cleaning', 'request_context'],
-        },
-	# remove request_context filter for db log to prevent infinite loop
-	# when logging sql query to retrieve the session user
-        'console_db': {
-            'level': 'DEBUG',
-            'class':'logging.StreamHandler',
-            'formatter': 'verbose_db',
-            'filters': ['cleaning'],
+            'filename' : '/var/log/django/sp_sso.log',
         },
     },
     'loggers': {
@@ -53,14 +41,7 @@ LOGGING = {
         # explicitly using DEBUG_DB
         'django': {
                 'level': 'INFO',
-        },
-        # django_select2 outputs debug message at level INFO
-        'django_select2': {
-                'level': 'WARNING',
-        },
-        # lasso has the bad habit of logging everything as errors
-        'lasso': {
-            'filters': ['force_debug'],
+                'handlers' : ['console'],
         },
     },
 }