yannweb/lodel2_mirror
1
0
Fork 0
mirror of https://github.com/yweber/lodel2.git synced 2025-10-31 19:49:02 +01:00
Code Releases Activity

Avoiding fails at session_restore

Browse source 
Before when session restore fails the webui was answering "Unknown status 200" as content.
Now it produce 2 log messages (maybe)
This commit is contained in:
Yann 2016-09-23 10:11:11 +02:00
commit 629ac94dc8
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lodel/auth/client.py
View file

@ -160,8 +160,11 @@ class Client(object, metaclass = ClientMetaclass):
if cls._instance.__session_token is not None: if cls._instance.__session_token is not None:
raise ClientAuthenticationError("Trying to restore a session, but \ raise ClientAuthenticationError("Trying to restore a session, but \
a session is allready started !!!") a session is allready started !!!")
cls._instance.__datas = SessionHandler.restore(token) try:
cls._instance.__session_token = token cls._instance.__datas = SessionHandler.restore(token)
cls._instance.__session_token = token
except ClientAuthenticationFailure:
logger.warning("Session restoring fails")
return copy.copy(cls._instance.datas) return copy.copy(cls._instance.datas)
##@brief Return the current session token or None ##@brief Return the current session token or None

6
plugins/webui/run.py
View file

@ -71,13 +71,9 @@ def application(env, start_response):
#to log messages with client infos #to log messages with client infos
client = WebUiClient(env['REMOTE_ADDR'], env['HTTP_USER_AGENT'], None) client = WebUiClient(env['REMOTE_ADDR'], env['HTTP_USER_AGENT'], None)
session_token = load_cookie(request) 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) WebUiClient.restore_session(session_token)
#next line is for testing purpose
print("ACCESS DATAS : ", WebUiClient['last_request'])
session_token = None session_token = None
#next line is for testing purpose
WebUiClient['last_request'] = time.time()
try: try:
controller = get_controller(request) controller = get_controller(request)