Skip to content
Snippets Groups Projects
Commit c2ea1622 authored by sveseli's avatar sveseli
Browse files

fixed issue with invalid session after restart

parent 111ad734
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,7 @@ import types ...@@ -13,6 +13,7 @@ import types
from dm.common.constants import dmServiceConstants from dm.common.constants import dmServiceConstants
from dm.common.exceptions.configurationError import ConfigurationError from dm.common.exceptions.configurationError import ConfigurationError
from dm.common.exceptions.authorizationError import AuthorizationError from dm.common.exceptions.authorizationError import AuthorizationError
from dm.common.exceptions.invalidSession import InvalidSession
from dm.common.exceptions.urlError import UrlError from dm.common.exceptions.urlError import UrlError
from dm.common.utility.loggingManager import LoggingManager from dm.common.utility.loggingManager import LoggingManager
from dm.common.utility.configurationManager import ConfigurationManager from dm.common.utility.configurationManager import ConfigurationManager
...@@ -196,7 +197,12 @@ class SessionManager: ...@@ -196,7 +197,12 @@ class SessionManager:
""" Send session request. """ """ Send session request. """
if self.sessionCookie is None: if self.sessionCookie is None:
self.establishSession(self.host, self.username, self.password) self.establishSession(self.host, self.username, self.password)
return self.sendRequest(url, method, contentType, data) try:
return self.sendRequest(url, method, contentType, data)
except InvalidSession, ex:
self.clearSessionFile()
self.establishSession(self.host, self.username, self.password)
return self.sendRequest(url, method, contentType, data)
def checkResponseHeadersForErrorsAndSaveSession(self, responseHeaders): def checkResponseHeadersForErrorsAndSaveSession(self, responseHeaders):
try: try:
...@@ -204,7 +210,7 @@ class SessionManager: ...@@ -204,7 +210,7 @@ class SessionManager:
sessionCookie = responseHeaders.get('Set-Cookie') sessionCookie = responseHeaders.get('Set-Cookie')
self.saveSession(sessionCookie) self.saveSession(sessionCookie)
return sessionCookie return sessionCookie
except AuthorizationError, ex: except (AuthorizationError, InvalidSession), ex:
self.clearSessionFile() self.clearSessionFile()
raise raise
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment