This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 70a82df Don't load defaults.conf twice. Only load it when initializing the loggers. new d8ecd2c follow-up commit for last commit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2gobroker/defaults.py | 5 +---- x2gobroker/loggers.py | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit d8ecd2c28ae3c503975247437379bd8c8a1d091b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 29 14:59:54 2014 +0100 follow-up commit for last commit --- x2gobroker/defaults.py | 5 +---- x2gobroker/loggers.py | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 74fad61..ef96e82 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -23,11 +23,10 @@ import sys import uuid import getpass import socket -import ConfigParser import pwd, grp import logging -from loggers import logger_broker, logger_access, logger_error, X2GOBROKER_DAEMON_USER +from loggers import logger_broker, logger_access, logger_error, PROG_NAME, X2GOBROKER_DAEMON_USER from loggers import iniconfig_loaded if iniconfig_loaded: from loggers import iniconfig, iniconfig_section @@ -36,8 +35,6 @@ X2GOBROKER_USER = pwd.getpwuid(os.geteuid())[0] X2GOBROKER_GROUP = grp.getgrgid(pwd.getpwuid(os.geteuid())[3])[0] os.environ['HOME'] = pwd.getpwuid(os.geteuid())[5] -PROG_NAME = os.path.basename(sys.argv[0]) - if os.environ.has_key('X2GOBROKER_DAEMON_GROUP'): X2GOBROKER_DAEMON_GROUP=os.environ['X2GOBROKER_DAEMON_GROUP'] elif iniconfig_loaded and iniconfig.has_option(iniconfig_section, 'X2GOBROKER_DAEMON_GROUP'): diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 4f078e6..c575e70 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -22,6 +22,7 @@ import sys import getpass import logging import logging.config +import ConfigParser def init_console_loggers(): """\ @@ -51,6 +52,8 @@ def init_console_loggers(): return (logger_broker, logger_access, logger_error) +PROG_NAME = os.path.basename(sys.argv[0]) + # load the defaults.conf file, if present iniconfig_loaded = None iniconfig_section = '-'.join(PROG_NAME.split('-')[1:]) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org