[X2Go-Commits] [x2gobroker] 01/02: we forgot to load the defaults.conf in loggers.py

git-admin at x2go.org git-admin at x2go.org
Wed Oct 29 14:41:44 CET 2014

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 7ae41a94f94aa295dada1f4b8ec225aaeb1a15e8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 29 14:39:45 2014 +0100

    we forgot to load the defaults.conf in loggers.py
 x2gobroker/loggers.py |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py
index c46c13c..4f078e6 100644
--- a/x2gobroker/loggers.py
+++ b/x2gobroker/loggers.py
@@ -51,6 +51,14 @@ def init_console_loggers():
     return (logger_broker, logger_access, logger_error)
+# load the defaults.conf file, if present
+iniconfig_loaded = None
+iniconfig_section = '-'.join(PROG_NAME.split('-')[1:])
+X2GOBROKER_DEFAULTS = "/etc/x2go/broker/defaults.conf"
+if os.path.isfile(X2GOBROKER_DEFAULTS) and os.access(X2GOBROKER_DEFAULTS, os.R_OK):
+    iniconfig = ConfigParser.SafeConfigParser()
+    iniconfig.optionxform = str
+    iniconfig_loaded = iniconfig.read(X2GOBROKER_DEFAULTS)
 # normally this would go into defaults.py, however, we do not want to create a dependency loop between loggers.py and defaults.py...
 if os.environ.has_key('X2GOBROKER_DAEMON_USER'):

Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git

More information about the x2go-commits mailing list