From 629ac94dc83a76834f3498e95a786736e01598ed Mon Sep 17 00:00:00 2001 From: Yann Date: Fri, 23 Sep 2016 10:11:11 +0200 Subject: [PATCH] Avoiding fails at session_restore Before when session restore fails the webui was answering "Unknown status 200" as content. Now it produce 2 log messages (maybe) --- lodel/auth/client.py | 7 +++++-- plugins/webui/run.py | 6 +----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lodel/auth/client.py b/lodel/auth/client.py index b505ebb..5f6fc59 100644 --- a/lodel/auth/client.py +++ b/lodel/auth/client.py @@ -160,8 +160,11 @@ class Client(object, metaclass = ClientMetaclass): if cls._instance.__session_token is not None: raise ClientAuthenticationError("Trying to restore a session, but \ a session is allready started !!!") - cls._instance.__datas = SessionHandler.restore(token) - cls._instance.__session_token = token + try: + cls._instance.__datas = SessionHandler.restore(token) + cls._instance.__session_token = token + except ClientAuthenticationFailure: + logger.warning("Session restoring fails") return copy.copy(cls._instance.datas) ##@brief Return the current session token or None diff --git a/plugins/webui/run.py b/plugins/webui/run.py index 6b5fa8e..cd9258d 100644 --- a/plugins/webui/run.py +++ b/plugins/webui/run.py @@ -71,13 +71,9 @@ def application(env, start_response): #to log messages with client infos client = WebUiClient(env['REMOTE_ADDR'], env['HTTP_USER_AGENT'], None) session_token = load_cookie(request) - if session_token is not None: + if session_token is not None and len(session_token) > 0: WebUiClient.restore_session(session_token) - #next line is for testing purpose - print("ACCESS DATAS : ", WebUiClient['last_request']) session_token = None - #next line is for testing purpose - WebUiClient['last_request'] = time.time() try: controller = get_controller(request)