Mercurial > libervia-web
changeset 456:da2a7f2b34c9
browser and server sides: use asyncConnect instead of connect
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Fri, 23 May 2014 10:41:42 +0200 |
| parents | 05e98b8d9f02 |
| children | b55bc50756fa |
| files | src/browser/libervia_main.py src/server/server.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/browser/libervia_main.py Thu May 29 15:51:26 2014 +0200 +++ b/src/browser/libervia_main.py Fri May 23 10:41:42 2014 +0200 @@ -121,7 +121,7 @@ class RegisterCall(LiberviaJsonProxy): def __init__(self): LiberviaJsonProxy.__init__(self, "/register_api", - ["isRegistered", "isConnected", "connect", "registerParams", "getMenus"]) + ["isRegistered", "isConnected", "asyncConnect", "registerParams", "getMenus"]) class BridgeCall(LiberviaJsonProxy): @@ -333,7 +333,7 @@ def _isConnectedCB(self, connected): if not connected: - self._register.call('connect', lambda x: self.logged()) + self._register.call('asyncConnect', lambda x: self.logged()) else: self.logged()
--- a/src/server/server.py Thu May 29 15:51:26 2014 +0200 +++ b/src/server/server.py Fri May 23 10:41:42 2014 +0200 @@ -743,13 +743,13 @@ profile = ISATSession(_session).profile return self.sat_host.bridge.isConnected(profile) - def jsonrpc_connect(self): + def jsonrpc_asyncConnect(self): _session = self.request.getSession() profile = ISATSession(_session).profile if profile in self.profiles_waiting: raise jsonrpclib.Fault(1, 'Already waiting') # FIXME: define some standard error codes for libervia self.profiles_waiting[profile] = self.request - self.sat_host.bridge.connect(profile) + self.sat_host.bridge.asyncConnect(profile) return server.NOT_DONE_YET def jsonrpc_isRegistered(self):