Force cherrypy.log.screen to be True to enable normal logging

It is needed for all levels of log messages, not just debug.

https://fedorahosted.org/ipsilon/ticket/171

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>

diff --git a/examples/ipsilon.conf b/examples/ipsilon.conf
index bd4924b..b76ac45 100644 (file)
--- a/examples/ipsilon.conf
+++ b/examples/ipsilon.conf
@@ -4,7 +4,6 @@ tools.log_request_response.on = False
 template_dir = "templates"
 db.conn.log = False
 
 template_dir = "templates"
 db.conn.log = False
 

-log.screen = True

 base.mount = "/idp"
 base.dir = "/usr/share/ipsilon"
 admin.config.db = "/var/lib/ipsilon/adminconfig.sqlite"
 base.mount = "/idp"
 base.dir = "/usr/share/ipsilon"
 admin.config.db = "/var/lib/ipsilon/adminconfig.sqlite"

diff --git a/ipsilon/ipsilon b/ipsilon/ipsilon
index c62a9aa..db82e7a 100755 (executable)
--- a/ipsilon/ipsilon
+++ b/ipsilon/ipsilon
@@ -33,6 +33,10 @@ cfgfile = find_config()
 cherrypy.lib.sessions.SqlSession = ipsilon.util.sessions.SqlSession
 cherrypy.config.update(cfgfile)
 
 cherrypy.lib.sessions.SqlSession = ipsilon.util.sessions.SqlSession
 cherrypy.config.update(cfgfile)
 

+# Force cherrypy logging to work. Note that this ignores the config-file
+# setting.
+cherrypy.log.screen = True
+

 nuke_session_locks()
 
 datastore = AdminStore()
 nuke_session_locks()
 
 datastore = AdminStore()

diff --git a/man/ipsilon.conf.5 b/man/ipsilon.conf.5
index 3245592..d9d7c4f 100644 (file)
--- a/man/ipsilon.conf.5
+++ b/man/ipsilon.conf.5
@@ -33,20 +33,17 @@ Options must appear in the section named [global]. There are no other sections d
 The following options are defined:
 .TP
 .B debug
 The following options are defined:
 .TP
 .B debug

-Enables additional debugging output. log.screen must also be True for this to be written.
+Enables additional debugging output.

 .TP
 .B tools.log_request_response.on
 Logs the full SAML 2 request and response information.
 .TP
 .B db.conn.log
 .TP
 .B tools.log_request_response.on
 Logs the full SAML 2 request and response information.
 .TP
 .B db.conn.log

-Enable verbose database connection tracing logs. debug and log.screen both need to be True for this to be written.
+Enable verbose database connection tracing logs. debug needs to be True for this to be written.

 .TP
 .B template_dir
 Location of the template directory used for buidling the UI. This can be relative to \fIbase.dir\fR.
 .TP
 .TP
 .B template_dir
 Location of the template directory used for buidling the UI. This can be relative to \fIbase.dir\fR.
 .TP

-.B log.screen
-Send logs to the console, which Apache grabs and adds to its own error log.
-.TP

 .B base.mount
 The base mount mount for UI pages. This should match the name of the IdP.
 .TP
 .B base.mount
 The base mount mount for UI pages. This should match the name of the IdP.
 .TP

diff --git a/templates/install/ipsilon.conf b/templates/install/ipsilon.conf
index f69ac9d..bc6313d 100644 (file)
--- a/templates/install/ipsilon.conf
+++ b/templates/install/ipsilon.conf
@@ -7,7 +7,6 @@ cleanup_interval = ${cleanup_interval}
 db.conn.log = False
 db.echo = False
 
 db.conn.log = False
 db.echo = False
 

-log.screen = ${debugging}

 base.mount = "/${instance}"
 base.dir = "${staticdir}"
 admin.config.db = "${admindb}"
 base.mount = "/${instance}"
 base.dir = "${staticdir}"
 admin.config.db = "${admindb}"