[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-23-g05c5aac

X2Go dev team git-admin at x2go.org
Mon Sep 23 23:06:40 CEST 2013


The branch, master has been updated
       via  05c5aac6426b3ff58746480f2273ac3135e39eea (commit)
      from  98a3df64e2c149490afa98293e22c3882f57b6f5 (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 -----------------------------------------------------------------
commit 05c5aac6426b3ff58746480f2273ac3135e39eea
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 23 23:06:23 2013 +0200

    When calling the agent's suspend_session function, make sure to pass on the remote_agent dictionary.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    2 ++
 x2gobroker/brokers/base_broker.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1424b3f..a7d89f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
     - Fix output of HTTP based connectivity test.
     - Do not let the broker crash if an agent is not reachable. Capture
       X2GoBrokerAgentExceptions when pinging the remote agent. (Fixes: #306).
+    - When calling the agent's suspend_session function, make sure to pass
+      on the remote_agent dictionary.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
 
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 7254377..5d4ada9 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -993,7 +993,7 @@ class X2GoBroker(object):
                         session_info = suspended_sessions[0]
                     else:
                         session_info = running_sessions[0]
-                        x2gobroker.agent.suspend_session(username=username, session_name=session_info.split('|')[1], query_mode=agent_query_mode)
+                        x2gobroker.agent.suspend_session(username=username, session_name=session_info.split('|')[1], query_mode=agent_query_mode, remote_agent=remote_agent)
                         # this is the turn-around in x2gocleansessions, so waiting as along as the daemon that will suspend the session
                         time.sleep(2)
                         session_info = session_info.replace('|R|', '|S|')


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