Commit 73a6df58 authored by Andreas Jung's avatar Andreas Jung

fixed style-guide violation: lines longer than 80 cols

parent 6d22123a
...@@ -7,9 +7,9 @@ _shutdown_timeout = 30 # seconds per phase ...@@ -7,9 +7,9 @@ _shutdown_timeout = 30 # seconds per phase
# #
# 0 Not yet terminating. running in main loop # 0 Not yet terminating. running in main loop
# #
# 1 Loss of service is imminent. Prepare any front-end proxies for this happening # 1 Loss of service is imminent. Prepare any front-end proxies for this
# by stopping any ICP servers, so that they can choose to send requests to other # happening by stopping any ICP servers, so that they can choose to send
# Zope servers in the cluster. # requests to other Zope servers in the cluster.
# #
# 2 Stop accepting any new requests. # 2 Stop accepting any new requests.
# #
...@@ -17,11 +17,11 @@ _shutdown_timeout = 30 # seconds per phase ...@@ -17,11 +17,11 @@ _shutdown_timeout = 30 # seconds per phase
# #
# 4 Already terminated # 4 Already terminated
# #
# It is up to individual socket handlers to implement these actions, by providing the # It is up to individual socket handlers to implement these actions, by
# 'clean_shutdown_control' method. This is called intermittantly during shutdown with # providing the 'clean_shutdown_control' method. This is called intermittantly
# two parameters; the current phase number, and the amount of time that it has currently # during shutdown with two parameters; the current phase number, and the amount
# been in that phase. This method should return true if it does not yet want shutdown to # of time that it has currently been in that phase. This method should return
# proceed to the next phase. # true if it does not yet want shutdown to proceed to the next phase.
def shutdown(exit_code,fast = 0): def shutdown(exit_code,fast = 0):
global _shutdown_phase global _shutdown_phase
...@@ -32,9 +32,10 @@ def shutdown(exit_code,fast = 0): ...@@ -32,9 +32,10 @@ def shutdown(exit_code,fast = 0):
ZServer.exit_code = exit_code ZServer.exit_code = exit_code
_shutdown_phase = 1 _shutdown_phase = 1
if fast: if fast:
# Someone wants us to shutdown fast. This is hooked into SIGTERM - so possibly # Someone wants us to shutdown fast. This is hooked into SIGTERM - so
# the system is going down and we can expect a SIGKILL within a few seconds. # possibly the system is going down and we can expect a SIGKILL within
# Limit each shutdown phase to one second. This is fast enough, but still clean. # a few seconds. Limit each shutdown phase to one second. This is fast
# enough, but still clean.
_shutdown_timeout = 1.0 _shutdown_timeout = 1.0
def loop(): def loop():
...@@ -72,8 +73,8 @@ def graceful_shutdown_loop(): ...@@ -72,8 +73,8 @@ def graceful_shutdown_loop():
except: except:
obj.handle_error() obj.handle_error()
if veto and time_in_this_phase<_shutdown_timeout: if veto and time_in_this_phase<_shutdown_timeout:
# Any open socket handler can veto moving on to the next shutdown phase. # Any open socket handler can veto moving on to the next shutdown
# (but not forever) # phase. (but not forever)
asyncore.poll(timeout, map) asyncore.poll(timeout, map)
else: else:
# No vetos? That is one step closer to shutting down # No vetos? That is one step closer to shutting down
......
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