[Mpuls-commits] r4042 - base/trunk/mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-10-27 10:56:27 +0200 (Wed, 27 Oct 2010)
New Revision: 4042

Modified:
   base/trunk/mpulsweb/lib/security.py
Log:
* mpulsweb/lib/security.py: Issue1271: Replaced info messages with
debugging messages.


Modified: base/trunk/mpulsweb/lib/security.py
===================================================================
--- base/trunk/mpulsweb/lib/security.py	2010-10-27 08:00:02 UTC (rev 4041)
+++ base/trunk/mpulsweb/lib/security.py	2010-10-27 08:56:27 UTC (rev 4042)
@@ -217,7 +217,7 @@
     if not dbname:
         # MPULS_DBNAME not set or empty, fall back to older request
         # header
-        log.info("No database name defined in http-header MPULS_DBNAME,"
+        log.debug("No database name defined in http-header MPULS_DBNAME,"
                  " falling back to SSL_CLIENT_S_DN_CN")
         dbname = request.environ.get('SSL_CLIENT_S_DN_CN')
 
@@ -248,17 +248,17 @@
     """
     dbname = get_dbname_from_list()
     if not dbname:
-        log.info("Could not determine database name from Request params,"
+        log.debug("Could not determine database name from Request params,"
                  " falling back to HTTP header ")
         dbname = get_dbname_from_http_header()
 
     if not dbname:
-        log.info("Could not determine database name from HTTP header,"
+        log.debug("Could not determine database name from HTTP header,"
                  " falling back to config file")
         dbname = get_dbname_from_config()
 
     if not dbname:
-        log.info("Could not determine database name from configuration file")
+        log.debug("Could not determine database name from configuration file")
         raise RuntimeError("Could not determine database name")
 
     return dbname
@@ -282,7 +282,7 @@
     if not subject_dn:
         # MPULS_APPNAME not set or empty, fall back to older request
         # header
-        log.info("HTTP-Header field MPULS_APPNAME not set or empty,"
+        log.debug("HTTP-Header field MPULS_APPNAME not set or empty,"
                  " falling back to SSL_CLIENT_S_DN")
         subject_dn = request.environ.get('SSL_CLIENT_S_DN')
     if not subject_dn:
@@ -293,7 +293,7 @@
         if field[0] == "OU":
             return field[1]
 
-    log.info("Subject DN found, but it did not contain an OU field")
+    log.debug("Subject DN found, but it did not contain an OU field")
     return None
 
 
@@ -306,12 +306,12 @@
     kaname = get_kaname_from_http_header()
 
     if not kaname:
-        log.info("Could not determine KA-name from HTTP header,"
+        log.debug("Could not determine KA-name from HTTP header,"
                  " falling back to config file")
         kaname = get_kaname_from_config()
 
     if not kaname:
-        log.info("Could not determine KA-Name from configuration file")
+        log.debug("Could not determine KA-Name from configuration file")
         raise RuntimeError("Could not determine KA-name name")
 
     return kaname