|
@@ -42,16 +42,6 @@ logger = get_logger(__name__)
|
|
|
is_jython = sys.platform.startswith('java')
|
|
|
is_pypy = hasattr(sys, 'pypy_version_info')
|
|
|
|
|
|
-
|
|
|
-def active_thread_count():
|
|
|
- from threading import enumerate
|
|
|
- return sum(1 for t in enumerate()
|
|
|
- if not t.name.startswith('Dummy-'))
|
|
|
-
|
|
|
-
|
|
|
-def safe_say(msg):
|
|
|
- print('\n{0}'.format(msg), file=sys.__stderr__)
|
|
|
-
|
|
|
ARTLINES = [
|
|
|
' --------------',
|
|
|
'---- **** -----',
|
|
@@ -89,6 +79,16 @@ EXTRA_INFO_FMT = """
|
|
|
"""
|
|
|
|
|
|
|
|
|
+def active_thread_count():
|
|
|
+ from threading import enumerate
|
|
|
+ return sum(1 for t in enumerate()
|
|
|
+ if not t.name.startswith('Dummy-'))
|
|
|
+
|
|
|
+
|
|
|
+def safe_say(msg):
|
|
|
+ print('\n{0}'.format(msg), file=sys.__stderr__)
|
|
|
+
|
|
|
+
|
|
|
class Worker(WorkController):
|
|
|
"""Worker as a program."""
|
|
|
|
|
@@ -282,6 +282,8 @@ def _shutdown_handler(worker, sig='TERM', how='Warm',
|
|
|
raise exc(exitcode)
|
|
|
_handle_request.__name__ = str('worker_{0}'.format(how))
|
|
|
platforms.signals[sig] = _handle_request
|
|
|
+
|
|
|
+
|
|
|
install_worker_term_handler = partial(
|
|
|
_shutdown_handler, sig='SIGTERM', how='Warm', exc=WorkerShutdown,
|
|
|
)
|
|
@@ -298,6 +300,8 @@ else: # pragma: no cover
|
|
|
def on_SIGINT(worker):
|
|
|
safe_say('worker: Hitting Ctrl+C again will terminate all running tasks!')
|
|
|
install_worker_term_hard_handler(worker, sig='SIGINT')
|
|
|
+
|
|
|
+
|
|
|
if not is_jython: # pragma: no cover
|
|
|
install_worker_int_handler = partial(
|
|
|
_shutdown_handler, sig='SIGINT', callback=on_SIGINT,
|