The branch, build-main has been updated via b075080bcd2a1510f4ac820f752580000712e509 (commit) from d76dcd7f32e82452e74e167ff9de4020403ecb84 (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/web/uccs.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index b75effa..6078383 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -84,6 +84,7 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): logger_error.error('client could not provide an IP address, pretending: 404 Not Found') raise tornado.web.HTTPError(404) + username = 'foo' #username = self.get_argument('user', default='') #password = self.get_argument('password', default='') #cookie = self.get_argument('cookie', default='') @@ -109,13 +110,14 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): for profile_id in profile_ids: - if profiles[profile_id]['directrdp']: + print profiles[profile_id] + if profiles[profile_id][u'directrdp']: pass else: ts = x2gobroker.uccsjson.X2GoServer( - url='{hostname}:{port}'.format(hostname=profiles[profile_id]['host'], port=profiles[profile_id]['sshport']) - name=profiles[profile_id]['name'] - username=profiles[profile_id]['user'] + 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) 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).