[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-66-g36ba0ef

[X2Go dev team]

The branch, master has been updated
       via  36ba0ef2fd1f7ad8d7deb27865b4cb3f0db56327 (commit)
      from  86c1afab1e0b1e3d200b72f39964603ecb810de4 (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 36ba0ef2fd1f7ad8d7deb27865b4cb3f0db56327
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Nov 21 09:10:42 2013 +0100

    Show correct environment variables in log file prelude when WSGI is used.

-----------------------------------------------------------------------

Summary of changes:
 bin/x2gobroker   |   30 ++++++++++++++++++------------
 debian/changelog |    1 +
 2 files changed, 19 insertions(+), 12 deletions(-)

The diff of changes is:
diff --git a/bin/x2gobroker b/bin/x2gobroker
index e37a5ee..2a1f319 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -49,6 +49,19 @@ def prep_http_mode():
     }
 
 
+def logfile_prelude():
+    logger_broker.info('X2Go Session Broker ({version}),'.format(version=__VERSION__))
+    logger_broker.info('  written by {author}'.format(author=__AUTHOR__))
+    logger_broker.info('Setting up the broker\'s environment...')
+    logger_broker.info('  X2GOBROKER_DEBUG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEBUG))
+    logger_broker.info('  X2GOBROKER_CONFIG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_CONFIG))
+    logger_broker.info('  X2GOBROKER_AGENT_CMD: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AGENT_CMD))
+    logger_broker.info('  X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET))
+    logger_broker.info('  X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND))
+    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))
+
+
 try:
     import x2gobroker.defaults
 except ImportError:
@@ -131,7 +144,8 @@ if __name__ == "__main__":
         if interactive_mode_warning:
             logger_broker.warn('X2Go Session Broker has been started interactively by user {username},'.format(username=x2gobroker.defaults.X2GOBROKER_USER))
             logger_broker.warn('  better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER))
-            logger_broker.info('Automatically switching to DEBUG mode due to interactive launch of this application.')
+            logger_broker.warn('Automatically switching to DEBUG mode due to interactive launch of this application.')
+            x2gobroker.defaults.X2GOBROKER_DEBUG = True
         if cmdline_args.bind is None: cmdline_args.bind = '127.0.0.1:8080'
         if cmdline_args.user:        logger_broker.warn('ignoring non-valid option --user for broker mode HTTP...')
         if cmdline_args.auth_cookie: logger_broker.warn('ignoring non-valid option --auth-cookie for broker mode HTTP...')
@@ -158,20 +172,11 @@ if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_T
     logger_access.setLevel(logging.DEBUG)
     logger_error.setLevel(logging.DEBUG)
 
-logger_broker.info('X2Go Session Broker ({version}),'.format(version=__VERSION__))
-logger_broker.info('  written by {author}'.format(author=__AUTHOR__))
-logger_broker.info('Setting up the broker\'s environment...')
-logger_broker.info('  X2GOBROKER_DEBUG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEBUG))
-logger_broker.info('  X2GOBROKER_CONFIG: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_CONFIG))
-logger_broker.info('  X2GOBROKER_AGENT_CMD: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AGENT_CMD))
-logger_broker.info('  X2GOBROKER_AUTHSERVICE_SOCKET: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_AUTHSERVICE_SOCKET))
-logger_broker.info('  X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=x2gobroker.defaults.X2GOBROKER_DEFAULT_BACKEND))
-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))
-
 # run the Python Tornado standalone daemon or handle interactive command line execution (via SSH)
 if __name__ == "__main__":
 
+    logfile_prelude()
+
     if cmdline_args.mode.upper() == 'HTTP':
 
         ### launch as standalone HTTP daemon ###
@@ -232,6 +237,7 @@ else:
             if key.startswith('X2GOBROKER_'):
                 os.environ.update({ key: environ[key] })
         reload(x2gobroker.defaults)
+        logfile_prelude()
 
         return _tornado_application(environ, start_response)
 
diff --git a/debian/changelog b/debian/changelog
index c78385c..34c496c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
       password is not provided or wrong.
     - Ship python2.6 asyncore patch (Debian squeeze python2.6 version) in
       python-x2gobroker's docs folder.
+    - Show correct environment variables in log file prelude when WSGI is used.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
     + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi.


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).