diff --git a/ZServer/ZService.py b/ZServer/ZService.py
index 9cfce4d60aacd4655f583ba7913256d9112aa418..9f2b42caa65a0cbc74339697ce8d3e5216a2eab5 100644
--- a/ZServer/ZService.py
+++ b/ZServer/ZService.py
@@ -1,293 +1,294 @@
-##############################################################################
-#
-# Zope Public License (ZPL) Version 1.0
-# -------------------------------------
-#
-# Copyright (c) Digital Creations. All rights reserved.
-#
-# This license has been certified as Open Source(tm).
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions in source code must retain the above copyright
-# notice, this list of conditions, and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions, and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. Digital Creations requests that attribution be given to Zope
-# in any manner possible. Zope includes a "Powered by Zope"
-# button that is installed by default. While it is not a license
-# violation to remove this button, it is requested that the
-# attribution remain. A significant investment has been put
-# into Zope, and this effort will continue if the Zope community
-# continues to grow. This is one way to assure that growth.
-#
-# 4. All advertising materials and documentation mentioning
-# features derived from or use of this software must display
-# the following acknowledgement:
-#
-# "This product includes software developed by Digital Creations
-# for use in the Z Object Publishing Environment
-# (http://www.zope.org/)."
-#
-# In the event that the product being advertised includes an
-# intact Zope distribution (with copyright and license included)
-# then this clause is waived.
-#
-# 5. Names associated with Zope or Digital Creations must not be used to
-# endorse or promote products derived from this software without
-# prior written permission from Digital Creations.
-#
-# 6. Modified redistributions of any form whatsoever must retain
-# the following acknowledgment:
-#
-# "This product includes software developed by Digital Creations
-# for use in the Z Object Publishing Environment
-# (http://www.zope.org/)."
-#
-# Intact (re-)distributions of any official Zope release do not
-# require an external acknowledgement.
-#
-# 7. Modifications are encouraged but must be packaged separately as
-# patches to official Zope releases. Distributions that do not
-# clearly separate the patches from the original work must be clearly
-# labeled as unofficial distributions. Modifications which do not
-# carry the name Zope may be packaged in any form, as long as they
-# conform to all of the clauses above.
-#
-#
-# Disclaimer
-#
-# THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
-# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#
-# This software consists of contributions made by Digital Creations and
-# many individuals on behalf of Digital Creations. Specific
-# attributions are listed in the accompanying credits file.
-#
-##############################################################################
-"""
-ZServer as a NT service.
-
-The serice starts up and monitors a ZServer process.
-
-Features:
-
- * When you start the service it starts ZServer
- * When you stop the serivice it stops ZServer
- * It monitors ZServer and restarts it if it exits abnormally
- * If ZServer is shutdown from the web, the service stops.
- * If ZServer cannot be restarted, the service stops.
-
-Usage:
-
- Installation
-
- The ZServer service should be installed by the Zope Windows
- installer. You can manually install, uninstall the service from
- the commandline.
-
- ZService.py [options] install|update|remove|start [...]
- |stop|restart [...]|debug [...]
-
- Options for 'install' and 'update' commands only:
-
- --username domain\username : The Username the service is to run
- under
-
- --password password : The password for the username
-
- --startup [manual|auto|disabled] : How the service starts,
- default = manual
-
- Commands
-
- install : Installs the service
-
- update : Updates the service, use this when you change
- ZServer.py
-
- remove : Removes the service
-
- start : Starts the service, this can also be done from the
- services control panel
-
- stop : Stops the service, this can also be done from the
- services control panel
-
- restart : Restarts the service
-
- debug : Runs the service in debug mode
-
- You can view the usage options by running ZServer.py without any
- arguments.
-
- Note: you may have to register the Python service program first,
-
- win32\pythonservice.exe /register
-
- Starting Zope
-
- Start Zope by clicking the 'start' button in the services control
- panel. You can set Zope to automatically start at boot time by
- choosing 'Auto' startup by clicking the 'statup' button.
-
- Stopping Zope
-
- Stop Zope by clicking the 'stop' button in the services control
- panel. You can also stop Zope through the web by going to the
- Zope control panel and by clicking 'Shutdown'.
-
- Event logging
-
- Zope events are logged to the NT application event log. Use the
- event viewer to keep track of Zope events.
-
- Registry Settings
-
- You can change how the service starts ZServer by editing a registry
- key.
-
- HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\
- <Service Name>\Parameters\start
-
- The value of this key is the command which the service uses to
- start ZServer. For example:
-
- "C:\Program Files\Zope\bin\python.exe"
- "C:\Program Files\Zope\z2.py" -w 8888
-
-
-TODO:
-
- * Integrate it into the Windows installer.
- * Add ZLOG logging in addition to event log logging.
- * Make it easier to run multiple Zope services with one Zope install
-
-This script does for NT the same sort of thing zdaemon.py does for UNIX.
-Requires Python win32api extensions.
-"""
-
-import win32api, win32serviceutil, win32service, win32event, win32process
-try: import servicemanager
-except: pass
-import time, imp, sys
-
-try:
- import App.version_txt
- ZOPE_VERSION=App.version_txt.version_txt()
-except:
- ZOPE_VERSION='1.10.x'
-
-# pythoncom and pywintypes are special, and require these hacks when
-# we dont have a standard Python installation around.
-
-def magic_import(modulename, filename):
- # by Mark Hammond
- try:
- # See if it does import first!
- return __import__(modulename)
- except ImportError:
- pass
- # win32 can find the DLL name.
- h = win32api.LoadLibrary(filename)
- found = win32api.GetModuleFileName(h)
- # Python can load the module
- mod = imp.load_module(modulename, None, found, ('.dll', 'rb', imp.C_EXTENSION))
- # inject it into the global module list.
- sys.modules[modulename] = mod
- # And finally inject it into the namespace.
- globals()[modulename] = mod
- win32api.FreeLibrary(h)
-
-magic_import('pywintypes','pywintypes15.dll')
-
-class ZServerService(win32serviceutil.ServiceFramework):
- _svc_name_ = "Zope%s" % ZOPE_VERSION
- _svc_display_name_ = "Zope (%s)" % ZOPE_VERSION
-
- restart_min_time=5 # if ZServer restarts before this many
- # seconds then we have a problem, and
- # need to stop the service.
-
- def __init__(self, args):
- win32serviceutil.ServiceFramework.__init__(self, args)
- self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
-
- def SvcDoRun(self):
- self.start_zserver()
- while 1:
- rc=win32event.WaitForMultipleObjects(
- (self.hWaitStop, self.hZServer), 0, win32event.INFINITE)
- if rc - win32event.WAIT_OBJECT_0 == 0:
- break
- else:
- self.restart_zserver()
- self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING, 5000)
-
- def SvcStop(self):
- servicemanager.LogInfoMsg('Stopping Zope.')
- try:
- self.stop_zserver()
- except:
- pass
- self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
- win32event.SetEvent(self.hWaitStop)
-
- def start_zserver(self):
- result=win32process.CreateProcess(None, self.get_start_command(),
- None, None, 0, 0, None, None, win32process.STARTUPINFO())
- self.hZServer=result[0]
- self.last_start_time=time.time()
- servicemanager.LogInfoMsg('Starting Zope.')
-
- def stop_zserver(self):
- win32process.TerminateProcess(self.hZServer,0)
-
- def restart_zserver(self):
- if time.time() - self.last_start_time < self.restart_min_time:
- servicemanager.LogErrorMsg('Zope died and could not be restarted.')
- self.SvcStop()
- code=win32process.GetExitCodeProcess(self.hZServer)
- if code == 0:
- # Exited with a normal status code,
- # assume that shutdown is intentional.
- self.SvcStop()
- else:
- servicemanager.LogWarningMsg('Restarting Zope.')
- self.start_zserver()
-
- def get_start_command(self):
- return win32serviceutil.GetServiceCustomOption(self,'start')
-
-
-def set_start_command(value):
- "sets the ZServer start command"
- win32serviceutil.SetServiceCustomOption(ZServerService,'start',value)
-
-
-if __name__=='__main__':
- win32serviceutil.HandleCommandLine(ZServerService)
- if sys.argv[1]=='install':
- if win32serviceutil.GetServiceCustomOption(ZServerService,'start') is None:
- import string, os.path
- home=string.split(sys.argv[0],'ZServer')[0]
- command='"%s" "%s" -S' % (sys.executable, os.path.join(home,'z2.py'))
- set_start_command(command)
- print "Setting ZServer start command to:", command
+##############################################################################
+#
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+#
+# Copyright (c) Digital Creations. All rights reserved.
+#
+# This license has been certified as Open Source(tm).
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions in source code must retain the above copyright
+# notice, this list of conditions, and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions, and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. Digital Creations requests that attribution be given to Zope
+# in any manner possible. Zope includes a "Powered by Zope"
+# button that is installed by default. While it is not a license
+# violation to remove this button, it is requested that the
+# attribution remain. A significant investment has been put
+# into Zope, and this effort will continue if the Zope community
+# continues to grow. This is one way to assure that growth.
+#
+# 4. All advertising materials and documentation mentioning
+# features derived from or use of this software must display
+# the following acknowledgement:
+#
+# "This product includes software developed by Digital Creations
+# for use in the Z Object Publishing Environment
+# (http://www.zope.org/)."
+#
+# In the event that the product being advertised includes an
+# intact Zope distribution (with copyright and license included)
+# then this clause is waived.
+#
+# 5. Names associated with Zope or Digital Creations must not be used to
+# endorse or promote products derived from this software without
+# prior written permission from Digital Creations.
+#
+# 6. Modified redistributions of any form whatsoever must retain
+# the following acknowledgment:
+#
+# "This product includes software developed by Digital Creations
+# for use in the Z Object Publishing Environment
+# (http://www.zope.org/)."
+#
+# Intact (re-)distributions of any official Zope release do not
+# require an external acknowledgement.
+#
+# 7. Modifications are encouraged but must be packaged separately as
+# patches to official Zope releases. Distributions that do not
+# clearly separate the patches from the original work must be clearly
+# labeled as unofficial distributions. Modifications which do not
+# carry the name Zope may be packaged in any form, as long as they
+# conform to all of the clauses above.
+#
+#
+# Disclaimer
+#
+# THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations. Specific
+# attributions are listed in the accompanying credits file.
+#
+##############################################################################
+"""
+ZServer as a NT service.
+
+The serice starts up and monitors a ZServer process.
+
+Features:
+
+ * When you start the service it starts ZServer
+ * When you stop the serivice it stops ZServer
+ * It monitors ZServer and restarts it if it exits abnormally
+ * If ZServer is shutdown from the web, the service stops.
+ * If ZServer cannot be restarted, the service stops.
+
+Usage:
+
+ Installation
+
+ The ZServer service should be installed by the Zope Windows
+ installer. You can manually install, uninstall the service from
+ the commandline.
+
+ ZService.py [options] install|update|remove|start [...]
+ |stop|restart [...]|debug [...]
+
+ Options for 'install' and 'update' commands only:
+
+ --username domain\username : The Username the service is to run
+ under
+
+ --password password : The password for the username
+
+ --startup [manual|auto|disabled] : How the service starts,
+ default = manual
+
+ Commands
+
+ install : Installs the service
+
+ update : Updates the service, use this when you change
+ ZServer.py
+
+ remove : Removes the service
+
+ start : Starts the service, this can also be done from the
+ services control panel
+
+ stop : Stops the service, this can also be done from the
+ services control panel
+
+ restart : Restarts the service
+
+ debug : Runs the service in debug mode
+
+ You can view the usage options by running ZServer.py without any
+ arguments.
+
+ Note: you may have to register the Python service program first,
+
+ win32\pythonservice.exe /register
+
+ Starting Zope
+
+ Start Zope by clicking the 'start' button in the services control
+ panel. You can set Zope to automatically start at boot time by
+ choosing 'Auto' startup by clicking the 'statup' button.
+
+ Stopping Zope
+
+ Stop Zope by clicking the 'stop' button in the services control
+ panel. You can also stop Zope through the web by going to the
+ Zope control panel and by clicking 'Shutdown'.
+
+ Event logging
+
+ Zope events are logged to the NT application event log. Use the
+ event viewer to keep track of Zope events.
+
+ Registry Settings
+
+ You can change how the service starts ZServer by editing a registry
+ key.
+
+ HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\
+ <Service Name>\Parameters\start
+
+ The value of this key is the command which the service uses to
+ start ZServer. For example:
+
+ "C:\Program Files\Zope\bin\python.exe"
+ "C:\Program Files\Zope\z2.py" -w 8888
+
+
+TODO:
+
+ * Integrate it into the Windows installer.
+ * Add ZLOG logging in addition to event log logging.
+ * Make it easier to run multiple Zope services with one Zope install
+
+This script does for NT the same sort of thing zdaemon.py does for UNIX.
+Requires Python win32api extensions.
+"""
+import sys
+sys.path.append('./lib/win32')
+import win32api, win32serviceutil, win32service, win32event, win32process
+try: import servicemanager
+except: pass
+import time, imp, sys
+
+try:
+ import App.version_txt
+ ZOPE_VERSION=App.version_txt.version_txt()
+except:
+ ZOPE_VERSION='1.10.x'
+
+# pythoncom and pywintypes are special, and require these hacks when
+# we dont have a standard Python installation around.
+
+def magic_import(modulename, filename):
+ # by Mark Hammond
+ try:
+ # See if it does import first!
+ return __import__(modulename)
+ except ImportError:
+ pass
+ # win32 can find the DLL name.
+ h = win32api.LoadLibrary(filename)
+ found = win32api.GetModuleFileName(h)
+ # Python can load the module
+ mod = imp.load_module(modulename, None, found, ('.dll', 'rb', imp.C_EXTENSION))
+ # inject it into the global module list.
+ sys.modules[modulename] = mod
+ # And finally inject it into the namespace.
+ globals()[modulename] = mod
+ win32api.FreeLibrary(h)
+
+magic_import('pywintypes','pywintypes15.dll')
+
+class ZServerService(win32serviceutil.ServiceFramework):
+ _svc_name_ = "Zope%s" % ZOPE_VERSION
+ _svc_display_name_ = "Zope (%s)" % ZOPE_VERSION
+
+ restart_min_time=5 # if ZServer restarts before this many
+ # seconds then we have a problem, and
+ # need to stop the service.
+
+ def __init__(self, args):
+ win32serviceutil.ServiceFramework.__init__(self, args)
+ self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
+
+ def SvcDoRun(self):
+ self.start_zserver()
+ while 1:
+ rc=win32event.WaitForMultipleObjects(
+ (self.hWaitStop, self.hZServer), 0, win32event.INFINITE)
+ if rc - win32event.WAIT_OBJECT_0 == 0:
+ break
+ else:
+ self.restart_zserver()
+ self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING, 5000)
+
+ def SvcStop(self):
+ servicemanager.LogInfoMsg('Stopping Zope.')
+ try:
+ self.stop_zserver()
+ except:
+ pass
+ self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
+ win32event.SetEvent(self.hWaitStop)
+
+ def start_zserver(self):
+ result=win32process.CreateProcess(None, self.get_start_command(),
+ None, None, 0, 0, None, None, win32process.STARTUPINFO())
+ self.hZServer=result[0]
+ self.last_start_time=time.time()
+ servicemanager.LogInfoMsg('Starting Zope.')
+
+ def stop_zserver(self):
+ win32process.TerminateProcess(self.hZServer,0)
+
+ def restart_zserver(self):
+ if time.time() - self.last_start_time < self.restart_min_time:
+ servicemanager.LogErrorMsg('Zope died and could not be restarted.')
+ self.SvcStop()
+ code=win32process.GetExitCodeProcess(self.hZServer)
+ if code == 0:
+ # Exited with a normal status code,
+ # assume that shutdown is intentional.
+ self.SvcStop()
+ else:
+ servicemanager.LogWarningMsg('Restarting Zope.')
+ self.start_zserver()
+
+ def get_start_command(self):
+ return win32serviceutil.GetServiceCustomOption(self,'start')
+
+
+def set_start_command(value):
+ "sets the ZServer start command"
+ win32serviceutil.SetServiceCustomOption(ZServerService,'start',value)
+
+
+if __name__=='__main__':
+ win32serviceutil.HandleCommandLine(ZServerService)
+ if sys.argv[1]=='install':
+ if win32serviceutil.GetServiceCustomOption(ZServerService,'start') is None:
+ import string, os.path
+ home=string.split(sys.argv[0],'ZServer')[0]
+ command='"%s" "%s" -S' % (sys.executable, os.path.join(home,'z2.py'))
+ set_start_command(command)
+ print "Setting ZServer start command to:", command
diff --git a/lib/python/ZServer/ZService.py b/lib/python/ZServer/ZService.py
index 9cfce4d60aacd4655f583ba7913256d9112aa418..9f2b42caa65a0cbc74339697ce8d3e5216a2eab5 100644
--- a/lib/python/ZServer/ZService.py
+++ b/lib/python/ZServer/ZService.py
@@ -1,293 +1,294 @@
-##############################################################################
-#
-# Zope Public License (ZPL) Version 1.0
-# -------------------------------------
-#
-# Copyright (c) Digital Creations. All rights reserved.
-#
-# This license has been certified as Open Source(tm).
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions in source code must retain the above copyright
-# notice, this list of conditions, and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions, and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. Digital Creations requests that attribution be given to Zope
-# in any manner possible. Zope includes a "Powered by Zope"
-# button that is installed by default. While it is not a license
-# violation to remove this button, it is requested that the
-# attribution remain. A significant investment has been put
-# into Zope, and this effort will continue if the Zope community
-# continues to grow. This is one way to assure that growth.
-#
-# 4. All advertising materials and documentation mentioning
-# features derived from or use of this software must display
-# the following acknowledgement:
-#
-# "This product includes software developed by Digital Creations
-# for use in the Z Object Publishing Environment
-# (http://www.zope.org/)."
-#
-# In the event that the product being advertised includes an
-# intact Zope distribution (with copyright and license included)
-# then this clause is waived.
-#
-# 5. Names associated with Zope or Digital Creations must not be used to
-# endorse or promote products derived from this software without
-# prior written permission from Digital Creations.
-#
-# 6. Modified redistributions of any form whatsoever must retain
-# the following acknowledgment:
-#
-# "This product includes software developed by Digital Creations
-# for use in the Z Object Publishing Environment
-# (http://www.zope.org/)."
-#
-# Intact (re-)distributions of any official Zope release do not
-# require an external acknowledgement.
-#
-# 7. Modifications are encouraged but must be packaged separately as
-# patches to official Zope releases. Distributions that do not
-# clearly separate the patches from the original work must be clearly
-# labeled as unofficial distributions. Modifications which do not
-# carry the name Zope may be packaged in any form, as long as they
-# conform to all of the clauses above.
-#
-#
-# Disclaimer
-#
-# THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
-# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#
-# This software consists of contributions made by Digital Creations and
-# many individuals on behalf of Digital Creations. Specific
-# attributions are listed in the accompanying credits file.
-#
-##############################################################################
-"""
-ZServer as a NT service.
-
-The serice starts up and monitors a ZServer process.
-
-Features:
-
- * When you start the service it starts ZServer
- * When you stop the serivice it stops ZServer
- * It monitors ZServer and restarts it if it exits abnormally
- * If ZServer is shutdown from the web, the service stops.
- * If ZServer cannot be restarted, the service stops.
-
-Usage:
-
- Installation
-
- The ZServer service should be installed by the Zope Windows
- installer. You can manually install, uninstall the service from
- the commandline.
-
- ZService.py [options] install|update|remove|start [...]
- |stop|restart [...]|debug [...]
-
- Options for 'install' and 'update' commands only:
-
- --username domain\username : The Username the service is to run
- under
-
- --password password : The password for the username
-
- --startup [manual|auto|disabled] : How the service starts,
- default = manual
-
- Commands
-
- install : Installs the service
-
- update : Updates the service, use this when you change
- ZServer.py
-
- remove : Removes the service
-
- start : Starts the service, this can also be done from the
- services control panel
-
- stop : Stops the service, this can also be done from the
- services control panel
-
- restart : Restarts the service
-
- debug : Runs the service in debug mode
-
- You can view the usage options by running ZServer.py without any
- arguments.
-
- Note: you may have to register the Python service program first,
-
- win32\pythonservice.exe /register
-
- Starting Zope
-
- Start Zope by clicking the 'start' button in the services control
- panel. You can set Zope to automatically start at boot time by
- choosing 'Auto' startup by clicking the 'statup' button.
-
- Stopping Zope
-
- Stop Zope by clicking the 'stop' button in the services control
- panel. You can also stop Zope through the web by going to the
- Zope control panel and by clicking 'Shutdown'.
-
- Event logging
-
- Zope events are logged to the NT application event log. Use the
- event viewer to keep track of Zope events.
-
- Registry Settings
-
- You can change how the service starts ZServer by editing a registry
- key.
-
- HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\
- <Service Name>\Parameters\start
-
- The value of this key is the command which the service uses to
- start ZServer. For example:
-
- "C:\Program Files\Zope\bin\python.exe"
- "C:\Program Files\Zope\z2.py" -w 8888
-
-
-TODO:
-
- * Integrate it into the Windows installer.
- * Add ZLOG logging in addition to event log logging.
- * Make it easier to run multiple Zope services with one Zope install
-
-This script does for NT the same sort of thing zdaemon.py does for UNIX.
-Requires Python win32api extensions.
-"""
-
-import win32api, win32serviceutil, win32service, win32event, win32process
-try: import servicemanager
-except: pass
-import time, imp, sys
-
-try:
- import App.version_txt
- ZOPE_VERSION=App.version_txt.version_txt()
-except:
- ZOPE_VERSION='1.10.x'
-
-# pythoncom and pywintypes are special, and require these hacks when
-# we dont have a standard Python installation around.
-
-def magic_import(modulename, filename):
- # by Mark Hammond
- try:
- # See if it does import first!
- return __import__(modulename)
- except ImportError:
- pass
- # win32 can find the DLL name.
- h = win32api.LoadLibrary(filename)
- found = win32api.GetModuleFileName(h)
- # Python can load the module
- mod = imp.load_module(modulename, None, found, ('.dll', 'rb', imp.C_EXTENSION))
- # inject it into the global module list.
- sys.modules[modulename] = mod
- # And finally inject it into the namespace.
- globals()[modulename] = mod
- win32api.FreeLibrary(h)
-
-magic_import('pywintypes','pywintypes15.dll')
-
-class ZServerService(win32serviceutil.ServiceFramework):
- _svc_name_ = "Zope%s" % ZOPE_VERSION
- _svc_display_name_ = "Zope (%s)" % ZOPE_VERSION
-
- restart_min_time=5 # if ZServer restarts before this many
- # seconds then we have a problem, and
- # need to stop the service.
-
- def __init__(self, args):
- win32serviceutil.ServiceFramework.__init__(self, args)
- self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
-
- def SvcDoRun(self):
- self.start_zserver()
- while 1:
- rc=win32event.WaitForMultipleObjects(
- (self.hWaitStop, self.hZServer), 0, win32event.INFINITE)
- if rc - win32event.WAIT_OBJECT_0 == 0:
- break
- else:
- self.restart_zserver()
- self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING, 5000)
-
- def SvcStop(self):
- servicemanager.LogInfoMsg('Stopping Zope.')
- try:
- self.stop_zserver()
- except:
- pass
- self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
- win32event.SetEvent(self.hWaitStop)
-
- def start_zserver(self):
- result=win32process.CreateProcess(None, self.get_start_command(),
- None, None, 0, 0, None, None, win32process.STARTUPINFO())
- self.hZServer=result[0]
- self.last_start_time=time.time()
- servicemanager.LogInfoMsg('Starting Zope.')
-
- def stop_zserver(self):
- win32process.TerminateProcess(self.hZServer,0)
-
- def restart_zserver(self):
- if time.time() - self.last_start_time < self.restart_min_time:
- servicemanager.LogErrorMsg('Zope died and could not be restarted.')
- self.SvcStop()
- code=win32process.GetExitCodeProcess(self.hZServer)
- if code == 0:
- # Exited with a normal status code,
- # assume that shutdown is intentional.
- self.SvcStop()
- else:
- servicemanager.LogWarningMsg('Restarting Zope.')
- self.start_zserver()
-
- def get_start_command(self):
- return win32serviceutil.GetServiceCustomOption(self,'start')
-
-
-def set_start_command(value):
- "sets the ZServer start command"
- win32serviceutil.SetServiceCustomOption(ZServerService,'start',value)
-
-
-if __name__=='__main__':
- win32serviceutil.HandleCommandLine(ZServerService)
- if sys.argv[1]=='install':
- if win32serviceutil.GetServiceCustomOption(ZServerService,'start') is None:
- import string, os.path
- home=string.split(sys.argv[0],'ZServer')[0]
- command='"%s" "%s" -S' % (sys.executable, os.path.join(home,'z2.py'))
- set_start_command(command)
- print "Setting ZServer start command to:", command
+##############################################################################
+#
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+#
+# Copyright (c) Digital Creations. All rights reserved.
+#
+# This license has been certified as Open Source(tm).
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions in source code must retain the above copyright
+# notice, this list of conditions, and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions, and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+#
+# 3. Digital Creations requests that attribution be given to Zope
+# in any manner possible. Zope includes a "Powered by Zope"
+# button that is installed by default. While it is not a license
+# violation to remove this button, it is requested that the
+# attribution remain. A significant investment has been put
+# into Zope, and this effort will continue if the Zope community
+# continues to grow. This is one way to assure that growth.
+#
+# 4. All advertising materials and documentation mentioning
+# features derived from or use of this software must display
+# the following acknowledgement:
+#
+# "This product includes software developed by Digital Creations
+# for use in the Z Object Publishing Environment
+# (http://www.zope.org/)."
+#
+# In the event that the product being advertised includes an
+# intact Zope distribution (with copyright and license included)
+# then this clause is waived.
+#
+# 5. Names associated with Zope or Digital Creations must not be used to
+# endorse or promote products derived from this software without
+# prior written permission from Digital Creations.
+#
+# 6. Modified redistributions of any form whatsoever must retain
+# the following acknowledgment:
+#
+# "This product includes software developed by Digital Creations
+# for use in the Z Object Publishing Environment
+# (http://www.zope.org/)."
+#
+# Intact (re-)distributions of any official Zope release do not
+# require an external acknowledgement.
+#
+# 7. Modifications are encouraged but must be packaged separately as
+# patches to official Zope releases. Distributions that do not
+# clearly separate the patches from the original work must be clearly
+# labeled as unofficial distributions. Modifications which do not
+# carry the name Zope may be packaged in any form, as long as they
+# conform to all of the clauses above.
+#
+#
+# Disclaimer
+#
+# THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations. Specific
+# attributions are listed in the accompanying credits file.
+#
+##############################################################################
+"""
+ZServer as a NT service.
+
+The serice starts up and monitors a ZServer process.
+
+Features:
+
+ * When you start the service it starts ZServer
+ * When you stop the serivice it stops ZServer
+ * It monitors ZServer and restarts it if it exits abnormally
+ * If ZServer is shutdown from the web, the service stops.
+ * If ZServer cannot be restarted, the service stops.
+
+Usage:
+
+ Installation
+
+ The ZServer service should be installed by the Zope Windows
+ installer. You can manually install, uninstall the service from
+ the commandline.
+
+ ZService.py [options] install|update|remove|start [...]
+ |stop|restart [...]|debug [...]
+
+ Options for 'install' and 'update' commands only:
+
+ --username domain\username : The Username the service is to run
+ under
+
+ --password password : The password for the username
+
+ --startup [manual|auto|disabled] : How the service starts,
+ default = manual
+
+ Commands
+
+ install : Installs the service
+
+ update : Updates the service, use this when you change
+ ZServer.py
+
+ remove : Removes the service
+
+ start : Starts the service, this can also be done from the
+ services control panel
+
+ stop : Stops the service, this can also be done from the
+ services control panel
+
+ restart : Restarts the service
+
+ debug : Runs the service in debug mode
+
+ You can view the usage options by running ZServer.py without any
+ arguments.
+
+ Note: you may have to register the Python service program first,
+
+ win32\pythonservice.exe /register
+
+ Starting Zope
+
+ Start Zope by clicking the 'start' button in the services control
+ panel. You can set Zope to automatically start at boot time by
+ choosing 'Auto' startup by clicking the 'statup' button.
+
+ Stopping Zope
+
+ Stop Zope by clicking the 'stop' button in the services control
+ panel. You can also stop Zope through the web by going to the
+ Zope control panel and by clicking 'Shutdown'.
+
+ Event logging
+
+ Zope events are logged to the NT application event log. Use the
+ event viewer to keep track of Zope events.
+
+ Registry Settings
+
+ You can change how the service starts ZServer by editing a registry
+ key.
+
+ HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\
+ <Service Name>\Parameters\start
+
+ The value of this key is the command which the service uses to
+ start ZServer. For example:
+
+ "C:\Program Files\Zope\bin\python.exe"
+ "C:\Program Files\Zope\z2.py" -w 8888
+
+
+TODO:
+
+ * Integrate it into the Windows installer.
+ * Add ZLOG logging in addition to event log logging.
+ * Make it easier to run multiple Zope services with one Zope install
+
+This script does for NT the same sort of thing zdaemon.py does for UNIX.
+Requires Python win32api extensions.
+"""
+import sys
+sys.path.append('./lib/win32')
+import win32api, win32serviceutil, win32service, win32event, win32process
+try: import servicemanager
+except: pass
+import time, imp, sys
+
+try:
+ import App.version_txt
+ ZOPE_VERSION=App.version_txt.version_txt()
+except:
+ ZOPE_VERSION='1.10.x'
+
+# pythoncom and pywintypes are special, and require these hacks when
+# we dont have a standard Python installation around.
+
+def magic_import(modulename, filename):
+ # by Mark Hammond
+ try:
+ # See if it does import first!
+ return __import__(modulename)
+ except ImportError:
+ pass
+ # win32 can find the DLL name.
+ h = win32api.LoadLibrary(filename)
+ found = win32api.GetModuleFileName(h)
+ # Python can load the module
+ mod = imp.load_module(modulename, None, found, ('.dll', 'rb', imp.C_EXTENSION))
+ # inject it into the global module list.
+ sys.modules[modulename] = mod
+ # And finally inject it into the namespace.
+ globals()[modulename] = mod
+ win32api.FreeLibrary(h)
+
+magic_import('pywintypes','pywintypes15.dll')
+
+class ZServerService(win32serviceutil.ServiceFramework):
+ _svc_name_ = "Zope%s" % ZOPE_VERSION
+ _svc_display_name_ = "Zope (%s)" % ZOPE_VERSION
+
+ restart_min_time=5 # if ZServer restarts before this many
+ # seconds then we have a problem, and
+ # need to stop the service.
+
+ def __init__(self, args):
+ win32serviceutil.ServiceFramework.__init__(self, args)
+ self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
+
+ def SvcDoRun(self):
+ self.start_zserver()
+ while 1:
+ rc=win32event.WaitForMultipleObjects(
+ (self.hWaitStop, self.hZServer), 0, win32event.INFINITE)
+ if rc - win32event.WAIT_OBJECT_0 == 0:
+ break
+ else:
+ self.restart_zserver()
+ self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING, 5000)
+
+ def SvcStop(self):
+ servicemanager.LogInfoMsg('Stopping Zope.')
+ try:
+ self.stop_zserver()
+ except:
+ pass
+ self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
+ win32event.SetEvent(self.hWaitStop)
+
+ def start_zserver(self):
+ result=win32process.CreateProcess(None, self.get_start_command(),
+ None, None, 0, 0, None, None, win32process.STARTUPINFO())
+ self.hZServer=result[0]
+ self.last_start_time=time.time()
+ servicemanager.LogInfoMsg('Starting Zope.')
+
+ def stop_zserver(self):
+ win32process.TerminateProcess(self.hZServer,0)
+
+ def restart_zserver(self):
+ if time.time() - self.last_start_time < self.restart_min_time:
+ servicemanager.LogErrorMsg('Zope died and could not be restarted.')
+ self.SvcStop()
+ code=win32process.GetExitCodeProcess(self.hZServer)
+ if code == 0:
+ # Exited with a normal status code,
+ # assume that shutdown is intentional.
+ self.SvcStop()
+ else:
+ servicemanager.LogWarningMsg('Restarting Zope.')
+ self.start_zserver()
+
+ def get_start_command(self):
+ return win32serviceutil.GetServiceCustomOption(self,'start')
+
+
+def set_start_command(value):
+ "sets the ZServer start command"
+ win32serviceutil.SetServiceCustomOption(ZServerService,'start',value)
+
+
+if __name__=='__main__':
+ win32serviceutil.HandleCommandLine(ZServerService)
+ if sys.argv[1]=='install':
+ if win32serviceutil.GetServiceCustomOption(ZServerService,'start') is None:
+ import string, os.path
+ home=string.split(sys.argv[0],'ZServer')[0]
+ command='"%s" "%s" -S' % (sys.executable, os.path.join(home,'z2.py'))
+ set_start_command(command)
+ print "Setting ZServer start command to:", command