x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - statusflag (branch) updated: 0.0.0.7-5-g7ddfc47
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 7ddfc47bf48a62ab7f871261d38048d9b15232be (commit) from 9cd07aa050f5a02af8987adeae6b28bbb02d7bd4 (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 - debian/rules | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 debian/dirs The diff of changes is: diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index e25db58..0000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -/usr \ No newline at end of file diff --git a/debian/rules b/debian/rules index bdf3e3f..28be4dc 100755 --- a/debian/rules +++ b/debian/rules @@ -28,3 +28,7 @@ DEB_PYTHON_INSTALL_ARGS_ALL = --install-layout=deb --single-version-externally-m include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/python-distutils.mk + +# needed when building with pysupport (e.g. on Ubuntu lucid) +common-binary-indep:: + mkdir -p debian/tmp/usr 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 - statusflag (branch) updated: 0.0.1.0-2-g19582aa
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated discards 5a4f129a152362b5bfb133d39638274ed0c65f41 (commit) via 19582aa37e0e3cab202c43cd7497d791cbeee1b3 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (5a4f129a152362b5bfb133d39638274ed0c65f41) \ N -- N -- N (19582aa37e0e3cab202c43cd7497d791cbeee1b3) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 | 3 +- debian/control | 89 +++++++++++++++++++++++++----------------------- debian/rules | 8 ++--- etc/x2gobroker.conf | 3 ++ sbin/x2gobroker | 1 + x2gobroker/defaults.py | 1 + 6 files changed, 57 insertions(+), 48 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 52d3774..b460d0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.1.0): + - Continue development... -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 10 Mar 2013 13:00:32 +0100 diff --git a/debian/control b/debian/control index 545adac..eb7187c 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: x2gobroker -Section: misc +Section: python Priority: optional Maintainer: X2Go Developers <x2go-dev(a)lists.berlios.de> Uploaders: @@ -13,46 +13,15 @@ Build-Depends: python-setuptools, python-nose, python-paste, -Standards-Version: 3.9.4 - -Package: python-x2gobroker -Section: python -Architecture: all -Depends: - ${python:Depends}, - ${misc:Depends}, - python-pampy, - python-netaddr, - python-tornado, - python-paramiko, -Description: X2Go http(s) based session broker (Python modules) - X2Go is a server based computing environment with - - session resuming - - low bandwidth support - - LDAP support - - client side mass storage mounting support - - client side printing support - - audio support - - authentication by smartcard and USB stick - . - The session broker is a server tool for X2Go that - tells your X2Go Client application in a terminal - server cluster what servers and session types are - most appropriate for the user in front of the - X2Go terminal. - . - A session broker is most useful in load balanced - X2Go server farms. - . - This package contains common files needed by all X2Go session - brokers being package for this distribution. -XS-Python-Version: >= 2.6 +Standards-Version: 3.9.3 +XS-Python-Version: >= 2.4 Package: x2gobroker Architecture: all Depends: - ${python:Depends}, ${misc:Depends}, + ${python:Depends}, + python, python-argparse, python-setproctitle, python-tornado, @@ -83,12 +52,13 @@ Description: X2Go http(s) based session broker (executable) Package: x2gobroker-authservice Architecture: all Depends: - ${python:Depends}, - ${misc:Depends}, + python, python-argparse, python-setproctitle, + ${misc:Depends}, + ${python:Depends}, Suggests: - x2gobroker-daemon, + apache2 | httpd, Description: X2Go http(s) based session broker (PAM authentication service) X2Go is a server based computing environment with - session resuming @@ -115,10 +85,13 @@ Package: x2gobroker-daemon Architecture: all Depends: ${misc:Depends}, + ${python:Depends}, adduser, x2gobroker (>= ${source:Version}), x2gobroker (<< ${source:Version}.1~), Recommends: x2gobroker-authservice, +Suggests: + apache2 | httpd, Description: X2Go http(s) based session broker (daemon) X2Go is a server based computing environment with - session resuming @@ -172,16 +145,46 @@ Description: X2Go http(s) based session broker (daemon) # the X2Go Session Broker as a CGI script so it # can be run from within an existing httpd server. +Package: python-x2gobroker +Architecture: all +Depends: + ${misc:Depends}, + ${python:Depends}, + python-pampy, + python-netaddr, + python-tornado, + python-paramiko, +Suggests: + apache2 | httpd, +Description: X2Go http(s) based session broker (Python modules) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + . + The session broker is a server tool for X2Go that + tells your X2Go Client application in a terminal + server cluster what servers and session types are + most appropriate for the user in front of the + X2Go terminal. + . + A session broker is most useful in load balanced + X2Go server farms. + . + This package contains common files needed by all X2Go session + brokers being package for this distribution. + Package: x2gobroker-agent Architecture: any Depends: ${shlibs:Depends}, - ${python:Depends}, ${misc:Depends}, - python-setproctitle, - python-argparse, - python-paramiko, perl, + python, adduser, x2goserver, Description: X2Go http(s) based session broker (common files) diff --git a/debian/rules b/debian/rules index 5521e3b..28be4dc 100755 --- a/debian/rules +++ b/debian/rules @@ -22,12 +22,12 @@ #export DEB_CFLAGS_MAINT_APPEND = -Wall #include /usr/share/dpkg/buildflags.mk -include /usr/share/cdbs/1/rules/debhelper.mk - DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport") -DEB_PYTHON_INSTALL_ARGS_python-x2gobroker ?= --root --prefix=$(DEB_PYTHON_PREFIX_ARG) --no-compile -O0 --install-layout=deb -include /usr/share/cdbs/1/class/python-distutils.mk +DEB_PYTHON_INSTALL_ARGS_ALL = --install-layout=deb --single-version-externally-managed + +include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/class/python-distutils.mk # needed when building with pysupport (e.g. on Ubuntu lucid) common-binary-indep:: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 24a530f..85eaa77 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -71,6 +71,9 @@ # enable {base_url}/plain/ #enable-plain-output = true +# enable {base_url}/uccs/ +#enable-uccs-output = false + # enable {base_url}/json/ (THIS IS FUTURE, mg-20121129) #enable-json-output = false diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 3951539..05678ab 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -116,6 +116,7 @@ import x2gobroker.web.extras # define the web.py URLs urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), + ('/uccs/(.*)', x2gobroker.web.uccs.X2GoBrokerWeb,), # ('/json/(.*)', x2gobroker.web.json.X2GoBrokerWeb,), # ('/html/(.*)', x2gobroker.web.html.X2GoBrokerWeb,), ('/pubkeys/', x2gobroker.web.extras.X2GoBrokerPubKeyService,), diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index cfc7372..fcbb8ca 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -118,6 +118,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { u'use-static-cookie': False, u'my-cookie': uuid.uuid4(), u'enable-plain-output': True, + u'enable-uccs-output': False, u'enable-json-output': False, u'enable-html-output': False, u'default-auth-mech': u'pam', 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 - statusflag (branch) updated: 0.0.0.7
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag 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 - statusflag (branch) updated: 0.0.0.6-14-g02b4250
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag 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 - statusflag (branch) updated: 0.0.0.6-16-g26629de
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 26629de904cb2dc49f576d156efd6913ab7cccdd (commit) from 9ffb7417721a1ca2ab19e48cca2a545c92a56e0e (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 | 2 ++ x2gobroker/web/extras.py | 2 +- x2gobroker/web/html.py | 2 +- x2gobroker/web/plain.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a640f0e..fb1facb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ x2gobroker (0.0.0.7-0~x2go1) UNRELEASED; urgency=low (Fixes: #132). - Return some sane output to x2goclient if the / all configured X2Go server(s) is/are down. + - Tornado: Use RequestHandler.set_header() instead of + RequestHandler.add_header(). * /debian/control: + Build-Depend on python-paste, python-nose (testsuite needs them). diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py index df48008..e1adf2a 100644 --- a/x2gobroker/web/extras.py +++ b/x2gobroker/web/extras.py @@ -40,7 +40,7 @@ class X2GoBrokerPubKeyService(tornado.web.RequestHandler): def _gen_http_header(self): for http_header_item in self.http_header_items.keys(): - self.add_header(http_header_item, self.http_header_items[http_header_item]) + self.set_header(http_header_item, self.http_header_items[http_header_item]) def GET(self): diff --git a/x2gobroker/web/html.py b/x2gobroker/web/html.py index a604239..fd76eb8 100644 --- a/x2gobroker/web/html.py +++ b/x2gobroker/web/html.py @@ -62,7 +62,7 @@ $output def _gen_http_header(self): for http_header_item in self.http_header_items.keys(): - self.add_header(http_header_item, self.http_header_items[http_header_item]) + self.set_header(http_header_item, self.http_header_items[http_header_item]) def get(self, backend): self._gen_http_header() diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index f85bc98..c4deb42 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -40,7 +40,7 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): def _gen_http_header(self): for http_header_item in self.http_header_items.keys(): - self.add_header(http_header_item, self.http_header_items[http_header_item]) + self.set_header(http_header_item, self.http_header_items[http_header_item]) def get(self, backend): if x2gobroker.defaults.X2GOBROKER_DEBUG: 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 - statusflag (branch) updated: 0.0.0.7-3-g70ea8f1
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag 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 - statusflag (branch) updated: 0.0.0.7-4-g9cd07aa
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag 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 - statusflag (branch) updated: 0.0.0.7-2-g2b21500
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 2b21500f91135c8646103c6389c5cf66c2be4c17 (commit) from 7475b931d6cc28ce59b0259d9d2b9c258e1bbc14 (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: Makefile | 3 --- debian/changelog | 6 +++++- debian/control | 4 ++-- debian/rules | 10 +++++++--- 4 files changed, 14 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 3c90c45..b5c2148 100755 --- a/Makefile +++ b/Makefile @@ -69,10 +69,7 @@ clean_arch: rm -f lib/x2gobroker-agent clean_indep: - -make -f Makefile.perl realclean test: - make -f Makefile.perl test install: - make -f Makefile.perl install diff --git a/debian/changelog b/debian/changelog index 6ae4d27..4b5447c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2gobroker (0.0.0.8-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.0.7): + - Continue development... + * /debian/control, /debian/rules: + + Add hack that allows building the package with python2 or pysupport, + depending on what's present on the build system. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 07 Mar 2013 07:16:33 +0100 diff --git a/debian/control b/debian/control index 79dc5cb..8dd0112 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Uploaders: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, Build-Depends: debhelper (>= 7.0.50~), - cdbs (>= 0.4.90~), - dpkg-dev (>= 1.16.1~), + cdbs (>= 0.4.49~), + dpkg-dev (>= (1.14.31~), python (>= 2.6.5-0~), python-setuptools, python-nose, diff --git a/debian/rules b/debian/rules index 997158b..bdf3e3f 100755 --- a/debian/rules +++ b/debian/rules @@ -17,9 +17,13 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_CFLAGS_MAINT_APPEND = -Wall -include /usr/share/dpkg/buildflags.mk +# this doesn't work, so commenting it out... +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +#export DEB_CFLAGS_MAINT_APPEND = -Wall +#include /usr/share/dpkg/buildflags.mk + +DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport") +DEB_PYTHON_INSTALL_ARGS_ALL = --install-layout=deb --single-version-externally-managed include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk 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 - statusflag (branch) updated: 0.0.0.6-15-g9ffb741
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag 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 - statusflag (branch) updated: 0.0.0.6-17-g42032bd
by git-admin＠x2go.org 04 Jun '13

04 Jun '13

The branch, statusflag has been updated via 42032bd1bbcef0555bb15baf022704c09d94c342 (commit) from 26629de904cb2dc49f576d156efd6913ab7cccdd (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 333368e..89aadac 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -842,7 +842,7 @@ class X2GoBroker(object): # 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 = [] - while not busy_servers and remote_agent: + while busy_servers is None and remote_agent: try: busy_servers = x2gobroker.agent.find_busy_servers(username=username, query_mode=agent_query_mode, remote_agent=remote_agent) 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