The branch, master has been updated via 6c69ef04e6fda090552dfb0fd09152b2a8aee96a (commit) from 5347ab0c3c00f99e3f30e9f274f5082c63b94b10 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6c69ef04e6fda090552dfb0fd09152b2a8aee96a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 1 13:20:06 2013 +0100 rotate order of logging message, make sure the application header gets shown in the log output on interactive x2gobroker execution ----------------------------------------------------------------------- Summary of changes: sbin/x2gobroker | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 66c51da..04e379c 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -39,6 +39,12 @@ from x2gobroker import __VERSION__ from x2gobroker import __AUTHOR__ from x2gobroker.loggers import logger_broker, logger_access, logger_error +# raise log level to DEBUG if requested... +if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_TESTSUITE: + logger_broker.setLevel(logging.DEBUG) + logger_access.setLevel(logging.DEBUG) + logger_error.setLevel(logging.DEBUG) + logger_broker.info('X2Go Session Broker ({version}), written by {author}'.format(version=__VERSION__, author=__AUTHOR__)) logger_broker.info('Setting up the broker\'s environment...') logger_broker.info(' X2GOBROKER_DEBUG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEBUG)) @@ -49,12 +55,6 @@ logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobrok logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE)) logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE)) -# raise log level to DEBUG if requested... -if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_TESTSUITE: - logger_broker.setLevel(logging.DEBUG) - logger_access.setLevel(logging.DEBUG) - logger_error.setLevel(logging.DEBUG) - # check effective UID the broker runs as and complain appropriately... if x2gobroker.defaults.X2GOBROKER_USER != x2gobroker.defaults.X2GOBROKER_DAEMON_USER and os.geteuid() != 0: logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=x2gobroker.defaults.X2GOBROKER_USER, daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).