[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.6-9-gfe61669
X2Go dev team
git-admin at x2go.org
Sun May 19 13:05:00 CEST 2013
The branch, build-main has been updated
via fe61669b7ab11de66223f62c52f380fc2b1e43bf (commit)
from e48dab769735322633d28a54c19f25bdeed27aa3 (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/agent.py | 3 ++-
x2gobroker/brokers/base_broker.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 3782bb5..001a800 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -24,6 +24,7 @@ import paramiko
import cStringIO
import time
import threading
+import socket
import x2gobroker._paramiko
x2gobroker._paramiko.monkey_patch_paramiko()
@@ -133,7 +134,7 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None)
client.close()
if result and result[0].startswith('OK'):
return [ r for r in result[1:] if r ]
- except paramiko.SSHException:
+ except (paramiko.SSHException, paramiko.AuthenticationException, paramiko.BadHostKeyException, socket.error):
raise x2gobroker.X2GoBrokerAgentException('Query to remote X2Go Broker Agent (user: {user}, hostname: {hostname}, port: {port}) failed'.format(user=remote_username, hostname=remote_hostname, port=remote_port))
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 273e605..15b79ac 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -795,7 +795,7 @@ class X2GoBroker(object):
for agent in exclude_agents:
if agent['hostname'] in server_list:
- server_list.remove(server)
+ server_list.remove(agent['hostname'])
remote_agent = None
if server_list:
@@ -840,6 +840,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:
+ 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)))
exclude_agents.append(remote_agent)
remote_agent = self.random_remote_agent(profile_id, exclude_agents=exclude_agents)
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