forked from shaba/openuds
fixed for windows & rest client api
This commit is contained in:
parent
cf40396211
commit
7bfa539e70
actor/src/udsactor
@ -102,7 +102,7 @@ class UDSApi: # pylint: disable=too-few-public-methods
|
|||||||
result = requests.post(self._apiURL(method), data=json.dumps(payLoad), headers=headers, verify=self._validateCert)
|
result = requests.post(self._apiURL(method), data=json.dumps(payLoad), headers=headers, verify=self._validateCert)
|
||||||
if result.ok:
|
if result.ok:
|
||||||
j = result.json()
|
j = result.json()
|
||||||
if 'error' not in j:
|
if not j.get('error', None):
|
||||||
return j['result']
|
return j['result']
|
||||||
except requests.ConnectionError as e:
|
except requests.ConnectionError as e:
|
||||||
raise RESTConnectionError(str(e))
|
raise RESTConnectionError(str(e))
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
'''
|
'''
|
||||||
# pylint: disable=invalid-name
|
# pylint: disable=invalid-name
|
||||||
import sys
|
import sys
|
||||||
|
import win32service
|
||||||
import win32serviceutil
|
import win32serviceutil
|
||||||
import servicemanager
|
import servicemanager
|
||||||
|
|
||||||
@ -37,10 +38,36 @@ import win32timezone # pylint: disable=unused-import
|
|||||||
|
|
||||||
from .service import UDSActorSvc
|
from .service import UDSActorSvc
|
||||||
|
|
||||||
|
def setupRecoverService():
|
||||||
|
svc_name = UDSActorSvc._svc_name_ # pylint: disable=protected-access
|
||||||
|
|
||||||
|
try:
|
||||||
|
hscm = win32service.OpenSCManager(None, None, win32service.SC_MANAGER_ALL_ACCESS)
|
||||||
|
|
||||||
|
try:
|
||||||
|
hs = win32serviceutil.SmartOpenService(hscm, svc_name, win32service.SERVICE_ALL_ACCESS)
|
||||||
|
service_failure_actions = {
|
||||||
|
'ResetPeriod': 864000, # Time in ms after which to reset the failure count to zero.
|
||||||
|
'RebootMsg': u'', # Not using reboot option
|
||||||
|
'Command': u'', # Not using run-command option
|
||||||
|
'Actions': [
|
||||||
|
(win32service.SC_ACTION_RESTART, 5000), # action, delay in ms
|
||||||
|
(win32service.SC_ACTION_RESTART, 5000)
|
||||||
|
]
|
||||||
|
}
|
||||||
|
win32service.ChangeServiceConfig2(hs, win32service.SERVICE_CONFIG_FAILURE_ACTIONS, service_failure_actions)
|
||||||
|
finally:
|
||||||
|
win32service.CloseServiceHandle(hs)
|
||||||
|
finally:
|
||||||
|
win32service.CloseServiceHandle(hscm)
|
||||||
|
|
||||||
|
|
||||||
def run() -> None:
|
def run() -> None:
|
||||||
if len(sys.argv) == 1:
|
if len(sys.argv) == 1:
|
||||||
servicemanager.Initialize()
|
servicemanager.Initialize()
|
||||||
servicemanager.PrepareToHostSingle(UDSActorSvc)
|
servicemanager.PrepareToHostSingle(UDSActorSvc)
|
||||||
servicemanager.StartServiceCtrlDispatcher()
|
servicemanager.StartServiceCtrlDispatcher()
|
||||||
|
elif sys.argv[1] == '--setup-recovery':
|
||||||
|
setupRecoverService()
|
||||||
else:
|
else:
|
||||||
win32serviceutil.HandleCommandLine(UDSActorSvc)
|
win32serviceutil.HandleCommandLine(UDSActorSvc)
|
||||||
|
@ -48,7 +48,7 @@ from ..service import CommonService
|
|||||||
from ..log import logger
|
from ..log import logger
|
||||||
|
|
||||||
from .SENS import SensLogon
|
from .SENS import SensLogon
|
||||||
from .SENS import logevent
|
# from .SENS import logevent
|
||||||
from .SENS import SENSGUID_EVENTCLASS_LOGON
|
from .SENS import SENSGUID_EVENTCLASS_LOGON
|
||||||
from .SENS import SENSGUID_PUBLISHER
|
from .SENS import SENSGUID_PUBLISHER
|
||||||
from .SENS import PROGID_EventSubscription
|
from .SENS import PROGID_EventSubscription
|
||||||
|
Loading…
Reference in New Issue
Block a user