This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 5456c1237a1904ae433c4f0d41c65f84d8923e9d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 13:19:18 2015 +0200 agent.py: Let get_servers() return a dictionary with hostnames as keys and number of sessions as values. --- debian/changelog | 2 ++ x2gobroker/agent.py | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2c82fe3..deb891f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -260,6 +260,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low cycle summary. - LoadCheckerServiceHandler(): Add line breaks in per-profile output. Return nothing if the load checker service is unreachable. + - agent.py: Let get_servers() return a dictionary with hostnames as keys + and number of sessions as values. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 92ed427..aa73a87 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -526,7 +526,17 @@ def get_servers(username, remote_agent=None, logger=None, **kwargs): if logger is None: logger = logger_broker - return call_broker_agent(username, task='getservers', remote_agent=remote_agent, logger=logger, **kwargs) + result = {} + success, lines = call_broker_agent(username, task='getservers', remote_agent=remote_agent, logger=logger, **kwargs) + if success: + for line in lines: + try: + if " " in line: + server, num_sessions = line.split(" ", 1) + result[server] = int(num_sessions) + except ValueError: + pass + return success, result tasks['getservers'] = get_servers -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git