[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-80-g03571aa

X2Go dev team git-admin at x2go.org
Wed Dec 11 11:52:53 CET 2013


The branch, master has been updated
       via  03571aae698c75701ab323aca1d7f8bf9a885b8a (commit)
      from  30cd766d9e8ac9b0ce52b7129dab52fca5068430 (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 03571aae698c75701ab323aca1d7f8bf9a885b8a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 11 11:51:25 2013 +0100

    WebUI "plain": throw explainative log errors for every 404 http error.

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

Summary of changes:
 debian/changelog                  |    1 +
 x2gobroker/brokers/base_broker.py |   10 ++++++++++
 x2gobroker/web/plain.py           |    3 +++
 3 files changed, 14 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f3d71b3..d14eddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Add a start page (,,It works'').
     - Use IP addresses in apache2 config rather than hostnames.
     - Add new helper tool: x2gobroker-daemon-debug.
+    - WebUI "plain": throw explainative log errors for every 404 http error.
   * debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
     + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi.
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 1a9664a..8a35475 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -85,6 +85,16 @@ class X2GoBroker(object):
         """
         return self.enabled
 
+    def get_name(self):
+        """\
+        Accessor for self.backend_name property.
+
+        @return: the backend name
+        @rtype: C{unicode}
+
+        """
+        return self.backend_name
+
     def enable(self):
         """\
         Enable this broker backend.
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index 0ef2564..340cca7 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -73,16 +73,19 @@ class X2GoBrokerWeb(_RequestHandler):
             exec("broker_backend = x2gobroker.brokers.{backend}_broker.X2GoBroker()".format(backend=backend))
         except ImportError:
             # throw a 404 if the backend does not exist
+            logger_error.error('No such broker backend \'{backend}\''.format(backend=backend)
             raise tornado.web.HTTPError(404)
 
         global_config = broker_backend.get_global_config()
 
         # throw a 404 if the WebUI is not enabled
         if not global_config['enable-plain-output']:
+            logger_error.error('The WebUI \'plain\' is not enabled in the global broker configuration')
             raise tornado.web.HTTPError(404)
 
         # if the broker backend is disabled in the configuration, pretend to have nothing on offer
         if not broker_backend.is_enabled():
+            logger_error.error('The broker backend \'{backend}\' is not enabled'.format(backend=broker_backend.get_name())
             raise tornado.web.HTTPError(404)
 
         # FIXME: this is to work around a bug in X2Go Client (http://bugs.x2go.org/138)


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