From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 18 Sep 2010 20:22:30 +0000 (-0700)
Subject: Fix improperly-renamed variable in set_blocking_signal_threshold
X-Git-Tag: v1.2.0~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f529b89863da8c5d8d5011f8d968e094fc2065f;p=thirdparty%2Ftornado.git

Fix improperly-renamed variable in set_blocking_signal_threshold
---

diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index 023534fcf..02ab73c46 100644
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -178,8 +178,8 @@ class IOLoop(object):
             logging.error("set_blocking_signal_threshold requires a signal module "
                        "with the setitimer method")
             return
-        self._blocking_signal_threshold = s
-        if s is not None:
+        self._blocking_signal_threshold = seconds
+        if seconds is not None:
             signal.signal(signal.SIGALRM,
                           action if action is not None else signal.SIG_DFL)
 
@@ -187,7 +187,7 @@ class IOLoop(object):
         """Logs a stack trace if the ioloop is blocked for more than s seconds.
         Equivalent to set_blocking_signal_threshold(seconds, self.log_stack)
         """
-        self.set_blocking_signal_threshold(s, self.log_stack)
+        self.set_blocking_signal_threshold(seconds, self.log_stack)
 
     def log_stack(self, signal, frame):
         """Signal handler to log the stack trace of the current thread.