From c54025748ed72b00e239379b5ebf7ca35cdafcb4 Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Mon, 11 May 2015 08:07:40 -0700 Subject: Don't display invalid error message when socket in use Previously, when the listening socket was already in use, this error message was displayed: ... File "/private/tmp/n/lib/python2.7/site-packages/Paste-1.7.5.1-py2.7.egg/paste/httpserver.py", line 1106, in server_close self.thread_pool.shutdown(60) AttributeError: 'WSGIThreadPoolServer' object has no attribute 'thread_pool' We prevent this by checking if `self` has a `thread_pool` attribute before trying to reference it. Fixes issue #5 (https://bitbucket.org/ianb/paste/issue/5/invalid-error-message-when-the-socket-is) --- paste/httpserver.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'paste') diff --git a/paste/httpserver.py b/paste/httpserver.py index 179e526..035d818 100755 --- a/paste/httpserver.py +++ b/paste/httpserver.py @@ -1104,7 +1104,8 @@ class ThreadPoolMixIn(object): # propogate, just keep handling pass finally: - self.thread_pool.shutdown() + if hasattr(self, 'thread_pool'): + self.thread_pool.shutdown() def server_activate(self): """ @@ -1119,7 +1120,8 @@ class ThreadPoolMixIn(object): """ self.running = False self.socket.close() - self.thread_pool.shutdown(60) + if hasattr(self, 'thread_pool'): + self.thread_pool.shutdown(60) class WSGIServerBase(SecureHTTPServer): def __init__(self, wsgi_application, server_address, -- cgit v1.2.1