[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-141-gf127c28

X2Go dev team git-admin at x2go.org
Fri Dec 20 23:20:19 CET 2013


The branch, master has been updated
       via  f127c285ba799fce05548305573b87e1c98927f3 (commit)
      from  4385a7569af19978621a7b2d8a016c6cc03b60f8 (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 f127c285ba799fce05548305573b87e1c98927f3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 20 23:15:06 2013 +0100

    Default to http broker mode when daemonizing the broker.

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

Summary of changes:
 bin/x2gobroker   |    8 ++++++++
 debian/changelog |    1 +
 2 files changed, 9 insertions(+)

The diff of changes is:
diff --git a/bin/x2gobroker b/bin/x2gobroker
index 287f0c7..2de8954 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -154,9 +154,16 @@ if __name__ == "__main__":
     if cmdline_args.debug:
         x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug
 
+    # daemonizing only makes sense for the HTTP broker mode...
+    if cmdline_args.daemonize:
+        cmdline_args.mode = 'HTTP'
+
+    # evaluate other cmdline options depending on the broker mode
     if cmdline_args.mode.upper() not in ('SSH', 'HTTP'):
         logger_broker.error('Invalid mode selected. Available: SSH or HTTP.')
         sys.exit(-1)
+
+    ### SSH broker
     elif cmdline_args.mode.upper() == 'SSH':
         if cmdline_args.bind: logger_broker.warn('ignoring non-valid option --bind for broker mode SSH...')
         if cmdline_args.daemonize: logger_broker.warn('ignoring non-valid option --daemonize for broker mode SSH...')
@@ -175,6 +182,7 @@ if __name__ == "__main__":
             print("")
             sys.exit(-2)
 
+    ### HTTP broker
     elif cmdline_args.mode.upper() == 'HTTP':
         if interactive_mode_warning:
             logger_broker.warn('X2Go Session Broker has been started interactively by user {username},'.format(username=x2gobroker.defaults.X2GOBROKER_USER))
diff --git a/debian/changelog b/debian/changelog
index b99fdb1..ae86bdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
       an sbin to a bin directory (executable for any user).
     - Make the inifile broker backend the default backend.
     - Support daemonizing of the http broker.
+    - Default to http broker mode when daemonizing the broker.
     - Support daemonizing of the authservice.
     - Detect RUNDIR in x2gobroker-authservice and use it for the default
       location of the authservice socket file.


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