From 87892a34544c3fee446288e0d52f30c774187bc7 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Mon, 12 Oct 2015 13:58:02 +0200 Subject: 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 --- service/pixelated/application.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'service/pixelated/application.py') 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() -- cgit v1.2.3