diff options
author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-10-12 13:58:02 +0200 |
---|---|---|
committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-10-12 13:58:02 +0200 |
commit | 87892a34544c3fee446288e0d52f30c774187bc7 (patch) | |
tree | 2c8d217aa9f69522abda0b79298a4e2009bf5b57 /service/pixelated/application.py | |
parent | 048418454631066426e53078740c009e729fd8ae (diff) |
Move SOLEDAD_INVALID_AUTH_TOKEN listner to outermost user agent start
- Issue #485
- Problem was that register starts ZMQ without a session every time
soledad is used
- This reverts commit 36b9261f609901b83da4f8915640eb6043530f01
Diffstat (limited to 'service/pixelated/application.py')
-rw-r--r-- | service/pixelated/application.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 1194a1a8..8502d5d1 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -28,6 +28,11 @@ from pixelated.config.site import PixelatedSite from pixelated.resources.loading_page import LoadingResource from pixelated.resources.root_resource import RootResource +from leap.common.events import ( + register, + catalog as events +) + @defer.inlineCallbacks def start_user_agent(loading_app, host, port, sslkey, sslcert, leap_home, leap_session): @@ -95,6 +100,11 @@ def initialize(): failure.printTraceback() reactor.stop() + def _register_shutdown_on_token_expire(leap_session): + register(events.SOLEDAD_INVALID_AUTH_TOKEN, lambda _: reactor.stop()) + return leap_session + + deferred.add_callback(_register_shutdown_on_token_expire) deferred.addErrback(_quit_on_error) reactor.run() |