x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2gobroker.git - build-main (branch) updated: 0.0.0.7
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 15fba676bee4d4cebb9d44afe30259ca282ea7ef (commit) from 42032bd1bbcef0555bb15baf022704c09d94c342 (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: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fb1facb..7b5e8b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gobroker (0.0.0.7-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.0.7-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (0.0.0.7): @@ -13,7 +13,7 @@ x2gobroker (0.0.0.7-0~x2go1) UNRELEASED; urgency=low * /debian/control: + Build-Depend on python-paste, python-nose (testsuite needs them). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 06 Mar 2013 17:45:40 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 07 Mar 2013 07:14:31 +0100 x2gobroker (0.0.0.6-0~x2go1) unstable; urgency=low 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.0.7-4-g9cd07aa
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 9cd07aa050f5a02af8987adeae6b28bbb02d7bd4 (commit) from 70ea8f1ed0b3a3521101b53e7ac7385ece8d5de1 (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: debian/dirs | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/dirs The diff of changes is: diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..e25db58 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +/usr \ No newline at end of file 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.0.7-1-g7475b93
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 7475b931d6cc28ce59b0259d9d2b9c258e1bbc14 (commit) from 15fba676bee4d4cebb9d44afe30259ca282ea7ef (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: debian/changelog | 6 ++++++ sbin/x2gobroker-pubkeyauthorizer | 2 +- x2gobroker/__init__.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7b5e8b0..6ae4d27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gobroker (0.0.0.8-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 07 Mar 2013 07:16:33 +0100 + x2gobroker (0.0.0.7-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 39440bb..9b0f9ca 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -36,7 +36,7 @@ import logging.config from pwd import getpwnam from grp import getgrnam -__VERSION__ = '0.0.0.7' +__VERSION__ = '0.0.0.8' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' PROG_NAME = os.path.basename(sys.argv[0]) diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index f63bf9c..3e64ee9 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,7 +18,7 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.0.7' +__VERSION__ = '0.0.0.8' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' from loggers import logger_error 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.0.7-3-g70ea8f1
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 70ea8f1ed0b3a3521101b53e7ac7385ece8d5de1 (commit) from 2b21500f91135c8646103c6389c5cf66c2be4c17 (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: debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index 8dd0112..eb7187c 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Build-Depends: debhelper (>= 7.0.50~), cdbs (>= 0.4.49~), - dpkg-dev (>= (1.14.31~), + dpkg-dev (>= 1.14.31~), python (>= 2.6.5-0~), python-setuptools, python-nose, 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.0.6-15-g9ffb741
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 9ffb7417721a1ca2ab19e48cca2a545c92a56e0e (commit) from 02b425048b6beca03c0ae202d54005157dc71d5f (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 | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index f9fd037..333368e 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -789,6 +789,13 @@ class X2GoBroker(object): def random_remote_agent(self, profile_id, exclude_agents=[]): """\ + Randomly choose a remote agent for agent query. + + @param profile_id: choose remote agent for this profile ID + @type profile_id: C{unicode} + @param exclude_agents: a list of remote agent dict objects to be exclude from the random choice + @type exclude_agents: C{list} + """ profile = self.get_profile(profile_id) server_list = profile[u'host'] @@ -822,6 +829,7 @@ class X2GoBroker(object): # if we have more than one server, pick one server randomly for X2Go Broker Agent queries server_list = profile[u'host'] + random.shuffle(server_list) agent_query_mode = self.get_agent_query_mode() remote_agent = None @@ -831,7 +839,6 @@ class X2GoBroker(object): # detect best X2Go server for this user if load balancing is configured if len(server_list) >= 2 and username: - # query remote agent for session info, if one of the server's is down, we will try the next one... busy_servers = None exclude_agents = [] @@ -842,12 +849,15 @@ class X2GoBroker(object): 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)) - # mark this agent as bad - exclude_agents.append(remote_agent) - # also remove this agent from the list of available servers as the machine is probably down - server_list.remove(remote_agent['hostname']) + if agent_query_mode.upper() == u'SSH': + # mark this agent as bad + exclude_agents.append(remote_agent) + # also remove this agent from the list of available servers as the machine is probably down + server_list.remove(remote_agent['hostname']) - remote_agent = self.random_remote_agent(profile_id, exclude_agents=exclude_agents) + remote_agent = self.random_remote_agent(profile_id, exclude_agents=exclude_agents) + else: + remote_agent = None if busy_servers is not None: 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.0.6-7-g09dff93
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 09dff9341cb3dc697bce90864fe3e9c76f059269 (commit) from 2573ffdec27908663f7ae786e6e9af4230dc69a8 (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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 2d9d1ec..04dd86b 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -837,7 +837,7 @@ class X2GoBroker(object): if len(subdomains_config) == 1: busy_servers_normalized, subdomains_agent = x2gobroker.utils.normalize_hostnames(busy_servers) - if len(subdomains_agent) == 1: + if len(subdomains_agent) <= 1: # all X2Go servers in the multi-node server farm are in the same DNS subdomain # we can operate on hostname-only hostnames 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.0.6-9-gfe61669
by git-admin＠x2go.org 19 May '13

19 May '13

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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.0.6-14-g02b4250
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 02b425048b6beca03c0ae202d54005157dc71d5f (commit) from 38e1f3976082c99519843ab8f4cfa0730bdd818c (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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index d5e775e..f9fd037 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -826,7 +826,7 @@ class X2GoBroker(object): remote_agent = None if agent_query_mode.upper() == u'SSH': - remote_agent = self.random_remote_agent(server_list) + remote_agent = self.random_remote_agent(profile_id) # detect best X2Go server for this user if load balancing is configured if len(server_list) >= 2 and username: 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.0.6-11-g7f25682
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 7f25682383416a9b0487d5cc0268dae9a8bdd0b4 (commit) from 8e73d26ce1bc5b1f8f1ce314877f90b37e6e8898 (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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 54de6ab..60e52c3 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -892,10 +892,12 @@ class X2GoBroker(object): else: logger_broker.warning('base_broker.X2GoBroker.select_session(): all expected broker agents failed to respond, this does not look good. We tried these agent hosts: {agent_hosts}'.format(agent_hosts=unicode(server_list))) - best_server = server_list[0] + if server_list: best_server = server_list[0] + else: return { 'server': 'no-server-available', 'port': profile[u'sshport'], } else: - best_server = server_list[0] + if server_list: best_server = server_list[0] + else: return { 'server': 'no-server-available', 'port': profile[u'sshport'], } selected_session = { 'server': best_server, 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).

1 0

x2gobroker.git - build-main (branch) updated: 0.0.0.6-6-g2573ffd
by git-admin＠x2go.org 19 May '13

19 May '13

The branch, build-main has been updated via 2573ffdec27908663f7ae786e6e9af4230dc69a8 (commit) from 9557b67570875897d1f45f61f174461c45b1a7c6 (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 | 2 ++ 1 file changed, 2 insertions(+) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 081960f..2d9d1ec 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -851,6 +851,8 @@ class X2GoBroker(object): busy_server_list = [ (load, server) for server, load in busy_servers.items() ] busy_server_list.sort() + logger_broker.debug('base_broker.X2GoBroker.select_session(): load balancer analysis: {server_load}'.format(server_load=unicode(busy_server_list))) + best_server = busy_server_list[0][1] else: 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).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits