[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 0.0.1.0-12-gad12802

X2Go dev team git-admin at x2go.org
Tue Jun 4 21:10:04 CEST 2013


The branch, statusflag has been updated
       via  ad12802c5aa0c60a2586d5874f638ef1dd7dc8e3 (commit)
      from  11cc12dd2fe8c0d0e171bb79e8272c7ee60528c9 (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:
 x2gobroker/web/html.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py
index fd76eb8..0e1988f 100644
--- a/x2gobroker/web/html.py
+++ b/x2gobroker/web/html.py
@@ -77,8 +77,14 @@ $output
 
         # silence pyflakes...
         broker_backend = None
-        exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend))
-        exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend))
+        try:
+            # dynamically detect broker backend from given URL
+            exec("import x2gobroker.brokers.{backend}_broker".format(backend=backend))
+            exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend))
+        except ImportError:
+            # throw a 404 if the backend does not exist
+            raise tornado.web.HTTPError(404)
+
         global_config = broker_backend.get_global_config()
         backend_config = broker_backend.get_backend_config(backend)
 


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