[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.4-2-g2b6b1a6

[X2Go dev team]

The branch, build-main has been updated
       via  2b6b1a6ab08fe4a723406812ffdce202ca2f0ea4 (commit)
      from  c6d2b8b91fe67cf9d751131ed0cdab98eb1b0477 (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:
 debian/changelog |    3 ++-
 sbin/x2gobroker  |   17 ++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 665a585..873161f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 x2gobroker (0.0.0.5-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * New upstream version (0.0.0.5):
+    - Prepare for WSGI based integration into an external httpd.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 27 Feb 2013 11:55:07 +0100
 
diff --git a/sbin/x2gobroker b/sbin/x2gobroker
index 846a7e5..5bf4a01 100755
--- a/sbin/x2gobroker
+++ b/sbin/x2gobroker
@@ -98,6 +98,12 @@ if __name__ == "__main__":
     # some people just give the port but prepend a colon, webpy does not like this, so we strip if off
     cmdline_args.bind = cmdline_args.bind.lstrip(':')
 
+    # tweak cmdline args so that they become suitable for the web.py framework
+    if len(sys.argv) <= 1:
+        sys.argv.append('')
+        sys.argv.append('')
+    sys.argv[1] = cmdline_args.bind
+    sys.argv[2:] = []
 
 # import classes serving the different web.py URLs
 import x2gobroker.web.plain
@@ -117,16 +123,13 @@ urls = ( '/plain/(.*)', 'x2gobroker.web.plain.X2GoBrokerWeb',
           '/pubkeys/', 'x2gobroker.web.extras.X2GoBrokerPubKeyService',
        )
 
+app = web.application(urls, globals(), autoreload=False)
+app.internalerror = web.debugerror
+application = web.wsgifunc()
+
 # run the web.py standalone daemon...
 if __name__ == "__main__":
-    if len(sys.argv) <= 1:
-        sys.argv.append('')
-        sys.argv.append('')
-    sys.argv[1] = cmdline_args.bind
-    sys.argv[2:] = []
     try:
-        app = web.application(urls, globals())
-        app.internalerror = web.debugerror
         app.run()
     except socket.error, e:
         print (e)


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