From: Ben Darnell Date: Sun, 24 Aug 2014 15:45:41 +0000 (-0400) Subject: s/SIGCHILD/SIGCHLD/ in docs. X-Git-Tag: v4.1.0b1~104 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e1d61abbdc40dc8f589514a7f59eef8f43302df;p=thirdparty%2Ftornado.git s/SIGCHILD/SIGCHLD/ in docs. --- diff --git a/tornado/ioloop.py b/tornado/ioloop.py index a8f662acb..38cb20e1d 100644 --- a/tornado/ioloop.py +++ b/tornado/ioloop.py @@ -724,7 +724,7 @@ class PollIOLoop(IOLoop): # # If someone has already set a wakeup fd, we don't want to # disturb it. This is an issue for twisted, which does its - # SIGCHILD processing in response to its own wakeup fd being + # SIGCHLD processing in response to its own wakeup fd being # written to. As long as the wakeup fd is registered on the IOLoop, # the loop will still wake up and everything should work. old_wakeup_fd = None diff --git a/tornado/process.py b/tornado/process.py index 0f38b856d..a74f4acec 100644 --- a/tornado/process.py +++ b/tornado/process.py @@ -240,7 +240,7 @@ class Subprocess(object): The callback takes one argument, the return code of the process. - This method uses a ``SIGCHILD`` handler, which is a global setting + This method uses a ``SIGCHLD`` handler, which is a global setting and may conflict if you have other libraries trying to handle the same signal. If you are using more than one ``IOLoop`` it may be necessary to call `Subprocess.initialize` first to designate @@ -257,7 +257,7 @@ class Subprocess(object): @classmethod def initialize(cls, io_loop=None): - """Initializes the ``SIGCHILD`` handler. + """Initializes the ``SIGCHLD`` handler. The signal handler is run on an `.IOLoop` to avoid locking issues. Note that the `.IOLoop` used for signal handling need not be the @@ -275,7 +275,7 @@ class Subprocess(object): @classmethod def uninitialize(cls): - """Removes the ``SIGCHILD`` handler.""" + """Removes the ``SIGCHLD`` handler.""" if not cls._initialized: return signal.signal(signal.SIGCHLD, cls._old_sigchld)