[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.1.0-71-gad71a6d

X2Go dev team git-admin at x2go.org
Fri Apr 26 00:53:21 CEST 2013


The branch, master has been updated
       via  ad71a6de92eb31ef0f3a3aae4aec16067573c35b (commit)
      from  81642aaf1a9a448bb00906fc6d57d2a324ae5a59 (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/brokers/base_broker.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 365ce0b..43e4d79 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -417,6 +417,7 @@ class X2GoBroker(object):
     def _do_authenticate(self, username='', password=''):
 
         if self._import_authmech_module(mech=self.get_authentication_mechanism()):
+            logger_broker.debug('base_broker.X2GoBroker._do_authenticate(): authenticating user={username} with password=<hidden> against backend={backend}.'.format(username=username, backend=self.backend_name))
             return self.authmech_module.X2GoBrokerAuthMech().authenticate(username, password)
         else:
             return False
@@ -850,7 +851,7 @@ class X2GoBroker(object):
 
                 try:
                     busy_servers = x2gobroker.agent.find_busy_servers(username=username, query_mode=agent_query_mode, remote_agent=remote_agent)
-                except x2gobroker.X2GoBrokerAgentException:
+                except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException:
                     logger_broker.warning('base_broker.X2GoBroker.select_session(): failed to query broker agent (quey-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent))
 
                     if agent_query_mode.upper() == u'SSH':


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