shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-01-03 01:17:56 +03:00
Code Issues Releases Wiki Activity

fixing actor on exit

Browse Source
This commit is contained in:
Adolfo Gómez García 2020-01-20 17:42:33 +01:00
parent dcf9e0137a
commit 26e429019e
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actor/src/udsactor/service.py
View File

@ -59,7 +59,6 @@ class CommonService: # pylint: disable=too-many-instance-attributes
_isAlive: bool = True _isAlive: bool = True
_rebootRequested: bool = False _rebootRequested: bool = False
_loggedIn = False _loggedIn = False
_ready = False
_cfg: types.ActorConfigurationType _cfg: types.ActorConfigurationType
_api: rest.UDSServerApi _api: rest.UDSServerApi
@ -128,8 +127,6 @@ class CommonService: # pylint: disable=too-many-instance-attributes
if not self._isAlive: if not self._isAlive:
return return
self._ready = False
# First, if postconfig is available, execute it and disable it # First, if postconfig is available, execute it and disable it
if self._cfg.post_command: if self._cfg.post_command:
self.execute(self._cfg.post_command, 'postConfig') self.execute(self._cfg.post_command, 'postConfig')
@ -146,9 +143,7 @@ class CommonService: # pylint: disable=too-many-instance-attributes
counter -= 1 counter -= 1
try: try:
self._certificate = self._api.ready(self._cfg.own_token, self._secret, srvInterface.ip, rest.LISTEN_PORT) self._certificate = self._api.ready(self._cfg.own_token, self._secret, srvInterface.ip, rest.LISTEN_PORT)
self._ready = True
except rest.RESTConnectionError as e: except rest.RESTConnectionError as e:
logger.error('Error en ready: %s -- %s', e, self._isAlive)
if not logged: # Only log connection problems ONCE if not logged: # Only log connection problems ONCE
logged = True logged = True
logger.error('Error connecting with UDS Broker') logger.error('Error connecting with UDS Broker')
@ -277,8 +272,7 @@ class CommonService: # pylint: disable=too-many-instance-attributes
if self._loggedIn and self._cfg.own_token: if self._loggedIn and self._cfg.own_token:
self._loggedIn = False self._loggedIn = False
try: try:
if self._ready: self._api.logout(self._cfg.own_token, '')
self._api.logout(self._cfg.own_token, '')
except Exception as e: except Exception as e:
logger.error('Error notifying final logout to UDS: %s', e) logger.error('Error notifying final logout to UDS: %s', e)
@ -364,8 +358,6 @@ class CommonService: # pylint: disable=too-many-instance-attributes
# Client notifications # Client notifications
def login(self, username: str) -> types.LoginResultInfoType: def login(self, username: str) -> types.LoginResultInfoType:
if not self._ready:
return types.LoginResultInfoType('', '', 0, 0)
result = types.LoginResultInfoType(ip='', hostname='', dead_line=None, max_idle=None) result = types.LoginResultInfoType(ip='', hostname='', dead_line=None, max_idle=None)
self._loggedIn = True self._loggedIn = True
if self._cfg.own_token: if self._cfg.own_token:
@ -373,8 +365,6 @@ class CommonService: # pylint: disable=too-many-instance-attributes
return result return result
def logout(self, username: str) -> None: def logout(self, username: str) -> None:
if not self._ready:
return
self._loggedIn = False self._loggedIn = False
if self._cfg.own_token: if self._cfg.own_token:
self._api.logout(self._cfg.own_token, username) self._api.logout(self._cfg.own_token, username)

1
actor/src/udsactor/windows/service.py
View File

@ -91,6 +91,7 @@ class UDSActorSvc(win32serviceutil.ServiceFramework, CommonService):
def doWait(self, miliseconds: int) -> None: def doWait(self, miliseconds: int) -> None:
win32event.WaitForSingleObject(self._hWaitStop, miliseconds) win32event.WaitForSingleObject(self._hWaitStop, miliseconds)
# On windows, and while on tasks, ensure that our app processes waiting messages on "wait times"
pythoncom.PumpWaitingMessages() # pylint: disable=no-member pythoncom.PumpWaitingMessages() # pylint: disable=no-member
def oneStepJoin(self, name: str, domain: str, ou: str, account: str, password: str) -> None: # pylint: disable=too-many-arguments def oneStepJoin(self, name: str, domain: str, ou: str, account: str, password: str) -> None: # pylint: disable=too-many-arguments