Skip to content

Z
Zope
Commit 050782db authored by Amos Latteier's avatar Amos Latteier
Browse files
Options

Added event logging.

parent a62d0bd1
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 30 deletions
ZServer/ZService.py
View file @ 050782db
...@@ -108,7 +108,8 @@ This script does for NT the same sort of thing zdeamon.py does for UNIX. ...@@ -108,7 +108,8 @@ This script does for NT the same sort of thing zdeamon.py does for UNIX.
Requires Python win32api extensions. Requires Python win32api extensions.
""" """
import win32serviceutil, win32service, win32event, win32process import win32api, win32serviceutil, win32service, win32event, win32process
import win32evtlog, win32evtlogutil
import time import time
def get_zope_version(): def get_zope_version():
...@@ -126,6 +127,8 @@ class ZServerService(win32serviceutil.ServiceFramework): ...@@ -126,6 +127,8 @@ class ZServerService(win32serviceutil.ServiceFramework):
def __init__(self, args): def __init__(self, args):
win32serviceutil.ServiceFramework.__init__(self, args) win32serviceutil.ServiceFramework.__init__(self, args)
self.hWaitStop = win32event.CreateEvent(None, 0, 0, None) self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
dll = win32api.GetModuleFileName(win32api.GetModuleHandle("win32evtlog.pyd"))
win32evtlogutil.AddSourceToRegistry("Zope",dll)
def SvcDoRun(self): def SvcDoRun(self):
self.start_zserver() self.start_zserver()
...@@ -141,23 +144,34 @@ class ZServerService(win32serviceutil.ServiceFramework): ...@@ -141,23 +144,34 @@ class ZServerService(win32serviceutil.ServiceFramework):
def SvcStop(self): def SvcStop(self):
try: try:
self.stop_zserver() self.stop_zserver()
win32evtlogutil.ReportEvent('Zope', 2,
eventType=win32evtlog.EVENTLOG_INFORMATION_TYPE,
strings=["Stopping Zope."]
)
except: except:
pass pass
self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING) self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
win32event.SetEvent(self.hWaitStop) win32event.SetEvent(self.hWaitStop)
def start_zserver(self): def start_zserver(self):
result=win32process.CreateProcess(None, '"%s" "%s" %s' % result=win32process.CreateProcess(None, self.get_start_command(),
(self.get_executable(), self.get_script(), self.get_args()),
None, None, 0, 0, None, None, win32process.STARTUPINFO()) None, None, 0, 0, None, None, win32process.STARTUPINFO())
self.hZServer=result[0] self.hZServer=result[0]
self.last_start_time=time.time() self.last_start_time=time.time()
win32evtlogutil.ReportEvent('Zope', 1,
eventType=win32evtlog.EVENTLOG_INFORMATION_TYPE,
strings=["Starting Zope."]
)
def stop_zserver(self): def stop_zserver(self):
win32process.TerminateProcess(self.hZServer,0) win32process.TerminateProcess(self.hZServer,0)
def restart_zserver(self): def restart_zserver(self):
if time.time() - self.last_start_time < self.restart_min_time: if time.time() - self.last_start_time < self.restart_min_time:
win32evtlogutil.ReportEvent('Zope', 4,
eventType=win32evtlog.EVENTLOG_ERROR_TYPE,
strings=["Zope died and could not be restarted."]
)
self.SvcStop() self.SvcStop()
code=win32process.GetExitCodeProcess(self.hZServer) code=win32process.GetExitCodeProcess(self.hZServer)
if code == 0: if code == 0:
...@@ -165,19 +179,16 @@ class ZServerService(win32serviceutil.ServiceFramework): ...@@ -165,19 +179,16 @@ class ZServerService(win32serviceutil.ServiceFramework):
# assume that shutdown is intentional. # assume that shutdown is intentional.
self.SvcStop() self.SvcStop()
else: else:
win32evtlogutil.ReportEvent('Zope', 3,
eventType=win32evtlog.EVENTLOG_WARNING_TYPE,
strings=["Restarting Zope."]
)
self.start_zserver() self.start_zserver()
def get_executable(self): def get_start_command(self):
# where should this info be stored, the registry? # where should this info be stored, the registry?
return "d:\\program files\\zope1.11.0pr0\\bin\\python.exe" return '"d:\\program files\\zope1.11.0pr0\\bin\\python.exe" "d:\\program files\\zope1.11.0pr0\\zserver\\mystart.py" -w 8888'
def get_script(self):
# where should this info be stored, the registry?
return "d:\\program files\\zope1.11.0pr0\\zserver\\mystart.py"
def get_args(self):
# where should this info be stored, the registry?
return "-w 8888"
if __name__=='__main__': if __name__=='__main__':
win32serviceutil.HandleCommandLine(ZServerService) win32serviceutil.HandleCommandLine(ZServerService)
\ No newline at end of file
lib/python/ZServer/ZService.py
View file @ 050782db
...@@ -108,7 +108,8 @@ This script does for NT the same sort of thing zdeamon.py does for UNIX. ...@@ -108,7 +108,8 @@ This script does for NT the same sort of thing zdeamon.py does for UNIX.
Requires Python win32api extensions. Requires Python win32api extensions.
""" """
import win32serviceutil, win32service, win32event, win32process import win32api, win32serviceutil, win32service, win32event, win32process
import win32evtlog, win32evtlogutil
import time import time
def get_zope_version(): def get_zope_version():
...@@ -126,6 +127,8 @@ class ZServerService(win32serviceutil.ServiceFramework): ...@@ -126,6 +127,8 @@ class ZServerService(win32serviceutil.ServiceFramework):
def __init__(self, args): def __init__(self, args):
win32serviceutil.ServiceFramework.__init__(self, args) win32serviceutil.ServiceFramework.__init__(self, args)
self.hWaitStop = win32event.CreateEvent(None, 0, 0, None) self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
dll = win32api.GetModuleFileName(win32api.GetModuleHandle("win32evtlog.pyd"))
win32evtlogutil.AddSourceToRegistry("Zope",dll)
def SvcDoRun(self): def SvcDoRun(self):
self.start_zserver() self.start_zserver()
...@@ -141,23 +144,34 @@ class ZServerService(win32serviceutil.ServiceFramework): ...@@ -141,23 +144,34 @@ class ZServerService(win32serviceutil.ServiceFramework):
def SvcStop(self): def SvcStop(self):
try: try:
self.stop_zserver() self.stop_zserver()
win32evtlogutil.ReportEvent('Zope', 2,
eventType=win32evtlog.EVENTLOG_INFORMATION_TYPE,
strings=["Stopping Zope."]
)
except: except:
pass pass
self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING) self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
win32event.SetEvent(self.hWaitStop) win32event.SetEvent(self.hWaitStop)
def start_zserver(self): def start_zserver(self):
result=win32process.CreateProcess(None, '"%s" "%s" %s' % result=win32process.CreateProcess(None, self.get_start_command(),
(self.get_executable(), self.get_script(), self.get_args()),
None, None, 0, 0, None, None, win32process.STARTUPINFO()) None, None, 0, 0, None, None, win32process.STARTUPINFO())
self.hZServer=result[0] self.hZServer=result[0]
self.last_start_time=time.time() self.last_start_time=time.time()
win32evtlogutil.ReportEvent('Zope', 1,
eventType=win32evtlog.EVENTLOG_INFORMATION_TYPE,
strings=["Starting Zope."]
)
def stop_zserver(self): def stop_zserver(self):
win32process.TerminateProcess(self.hZServer,0) win32process.TerminateProcess(self.hZServer,0)
def restart_zserver(self): def restart_zserver(self):
if time.time() - self.last_start_time < self.restart_min_time: if time.time() - self.last_start_time < self.restart_min_time:
win32evtlogutil.ReportEvent('Zope', 4,
eventType=win32evtlog.EVENTLOG_ERROR_TYPE,
strings=["Zope died and could not be restarted."]
)
self.SvcStop() self.SvcStop()
code=win32process.GetExitCodeProcess(self.hZServer) code=win32process.GetExitCodeProcess(self.hZServer)
if code == 0: if code == 0:
...@@ -165,19 +179,16 @@ class ZServerService(win32serviceutil.ServiceFramework): ...@@ -165,19 +179,16 @@ class ZServerService(win32serviceutil.ServiceFramework):
# assume that shutdown is intentional. # assume that shutdown is intentional.
self.SvcStop() self.SvcStop()
else: else:
win32evtlogutil.ReportEvent('Zope', 3,
eventType=win32evtlog.EVENTLOG_WARNING_TYPE,
strings=["Restarting Zope."]
)
self.start_zserver() self.start_zserver()
def get_executable(self): def get_start_command(self):
# where should this info be stored, the registry? # where should this info be stored, the registry?
return "d:\\program files\\zope1.11.0pr0\\bin\\python.exe" return '"d:\\program files\\zope1.11.0pr0\\bin\\python.exe" "d:\\program files\\zope1.11.0pr0\\zserver\\mystart.py" -w 8888'
def get_script(self):
# where should this info be stored, the registry?
return "d:\\program files\\zope1.11.0pr0\\zserver\\mystart.py"
def get_args(self):
# where should this info be stored, the registry?
return "-w 8888"
if __name__=='__main__': if __name__=='__main__':
win32serviceutil.HandleCommandLine(ZServerService) win32serviceutil.HandleCommandLine(ZServerService)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7