[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.1.0-15-gd3a17b1
X2Go dev team
git-admin at x2go.org
Sun May 19 13:05:04 CEST 2013
The branch, build-main has been updated
via d3a17b136b23755840e13547152011193c2febe9 (commit)
from cbe481e17814bf14404b4adc95fc6ae53efa52a1 (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/uccsjson.py | 2 +-
x2gobroker/web/uccs.py | 36 +++++++++++++++++-------------------
2 files changed, 18 insertions(+), 20 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py
index 779e2ba..abbcd80 100644
--- a/x2gobroker/uccsjson.py
+++ b/x2gobroker/uccsjson.py
@@ -62,7 +62,7 @@ class ManagementServer():
else:
raise TypeError("set_default expects a string argument")
- def add_terminal_server(self, server):
+ def add_terminalserver(self, server):
"""\
Add a terminal server to this management server object.
diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py
index 6078383..394583c 100644
--- a/x2gobroker/web/uccs.py
+++ b/x2gobroker/web/uccs.py
@@ -102,29 +102,27 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
###
profiles = broker_backend.list_profiles(username)
- if profiles:
- ms = x2gobroker.uccsjson.ManagementServer('http://localhost:8080/uccs/{backend}'.format(backend=backend), 'X2Go Session Broker')
+ ms = x2gobroker.uccsjson.ManagementServer('http://localhost:8080/uccs/{backend}'.format(backend=backend), 'X2Go Session Broker')
- profile_ids = profiles.keys()
- profile_ids.sort()
+ profile_ids = profiles.keys()
+ profile_ids.sort()
- for profile_id in profile_ids:
+ for profile_id in profile_ids:
- print profiles[profile_id]
- if profiles[profile_id][u'directrdp']:
- pass
- else:
- ts = x2gobroker.uccsjson.X2GoServer(
- host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'], port=profiles[profile_id][u'sshport']),
- name=profiles[profile_id][u'name'],
- username=profiles[profile_id][u'user'],
- )
- ms.add_terminal(ts)
+ if profiles[profile_id][u'directrdp']:
+ pass
+ else:
+ ts = x2gobroker.uccsjson.X2GoServer(
+ host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'], port=profiles[profile_id][u'sshport']),
+ name=profiles[profile_id][u'name'],
+ username=profiles[profile_id][u'user'],
+ )
+ ms.add_terminalserver(ts)
- output += ms.toJson()
+ output += ms.toJson()
- self.write(output)
- return
+ self.write(output)
+ return
- raise tornado.web.HTTPError(401)
+ #raise tornado.web.HTTPError(401)
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