[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-13-g6be0aa0

[X2Go dev team]

The branch, master has been updated
       via  6be0aa0ce1e0f079b9ab4e39d6166ab7e8411a99 (commit)
      from  5b10c97493111d76064747cdb6af64bcfc0b7b9d (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 6be0aa0ce1e0f079b9ab4e39d6166ab7e8411a99
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 18 21:10:02 2013 +0200

    log output fine-tuning

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

Summary of changes:
 bin/x2gobroker |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/bin/x2gobroker b/bin/x2gobroker
index dd8e633..36b3809 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -60,7 +60,8 @@ interactive_mode_warning = False
 if x2gobroker.defaults.X2GOBROKER_USER != x2gobroker.defaults.X2GOBROKER_DAEMON_USER and os.geteuid() != 0:
     interactive_mode_warning = True
 elif x2gobroker.defaults.X2GOBROKER_DAEMON_USER != 'root' and os.geteuid() == 0:
-    logger_broker.warn('X2Go Session Broker should not be run as root, better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER))
+    logger_broker.warn('X2Go Session Broker should not be run as root,')
+    logger_broker.warn('  better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER))
 elif os.geteuid() == 0:
     logger_broker.warn('X2Go Session Broker should not be run as root, better run as non-privileged user')
 
@@ -125,7 +126,8 @@ if __name__ == "__main__":
 
     elif cmdline_args.mode.upper() == 'HTTP':
         if interactive_mode_warning:
-            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))
+            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.')
         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...')


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