[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.1.0-72-g85ffd94

X2Go dev team git-admin at x2go.org
Fri Apr 26 00:53:21 CEST 2013


The branch, master has been updated
       via  85ffd94dae231162d20c38c9c7a2c7dab99b6e0c (commit)
      from  ad71a6de92eb31ef0f3a3aae4aec16067573c35b (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 bin/x2gobroker-testauth |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth
index fd8a5a7..d8ef295 100755
--- a/bin/x2gobroker-testauth
+++ b/bin/x2gobroker-testauth
@@ -24,6 +24,7 @@ import os
 import sys
 import setproctitle
 import argparse
+import logging
 
 # perform an authentication against the authentication mechanism configured for WSGI
 try:
@@ -31,6 +32,7 @@ try:
 except ImportError:
     sys.path.insert(0, os.path.join(os.getcwd(), '..'))
     import x2gobroker.defaults
+import x2gobroker.loggers
 
 PROG_NAME = os.path.basename(sys.argv[0])
 PROG_OPTIONS = sys.argv[1:]
@@ -78,12 +80,16 @@ if __name__ == "__main__":
     if cmdline_args.config_file is not None:
         x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file
 
-    x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug
+    if cmdline_args.debug:
+        x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug
+        # raise log level to DEBUG if requested...
+        if x2gobroker.defaults.X2GOBROKER_DEBUG and not x2gobroker.defaults.X2GOBROKER_TESTSUITE:
+            x2gobroker.loggers.logger_broker.setLevel(logging.DEBUG)
+            x2gobroker.loggers.logger_error.setLevel(logging.DEBUG)
+
     username = cmdline_args.username
     password = cmdline_args.password
 
-import x2gobroker.config
-
 config_file = x2gobroker.defaults.X2GOBROKER_CONFIG
 config_defaults = x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS
 


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




More information about the x2go-commits mailing list