[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 0.0.1.0-39-g112ebe4
X2Go dev team
git-admin at x2go.org
Tue Jun 4 21:10:14 CEST 2013
The branch, statusflag has been updated
via 112ebe4f0f5494b18ebda527d6920aa5e1440fae (commit)
from 041db4bb343d596e5861c54d80db45ab622cbf9d (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 76ed8ef..b9038c3 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
@@ -847,7 +848,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