[FIX] server.py traceback on ctrl-c from windows cmd
Define a shim signal.SIGHUP on windows to avoid an ifdef in the threaded server loop.
This commit is contained in:
parent
7999965af6
commit
aa9eec3497
|
@ -9,10 +9,6 @@ import os.path
|
||||||
import platform
|
import platform
|
||||||
import psutil
|
import psutil
|
||||||
import random
|
import random
|
||||||
if os.name == 'posix':
|
|
||||||
import resource
|
|
||||||
else:
|
|
||||||
resource = None
|
|
||||||
import select
|
import select
|
||||||
import signal
|
import signal
|
||||||
import socket
|
import socket
|
||||||
|
@ -24,10 +20,15 @@ import unittest2
|
||||||
|
|
||||||
import werkzeug.serving
|
import werkzeug.serving
|
||||||
|
|
||||||
try:
|
if os.name == 'posix':
|
||||||
|
# Unix only for workers
|
||||||
import fcntl
|
import fcntl
|
||||||
except ImportError:
|
import resource
|
||||||
pass
|
else:
|
||||||
|
# Windows shim
|
||||||
|
signal.SIGHUP = 0
|
||||||
|
|
||||||
|
# Optional process names for workers
|
||||||
try:
|
try:
|
||||||
from setproctitle import setproctitle
|
from setproctitle import setproctitle
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
@ -674,8 +675,6 @@ class Worker(object):
|
||||||
raise
|
raise
|
||||||
|
|
||||||
def process_limit(self):
|
def process_limit(self):
|
||||||
if resource is None:
|
|
||||||
return
|
|
||||||
# If our parent changed sucide
|
# If our parent changed sucide
|
||||||
if self.ppid != os.getppid():
|
if self.ppid != os.getppid():
|
||||||
_logger.info("Worker (%s) Parent changed", self.pid)
|
_logger.info("Worker (%s) Parent changed", self.pid)
|
||||||
|
|
Loading…
Reference in New Issue