From e92b5d95ca0c9b80b4adf2c05c7c7f27113ed125 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sun, 30 Dec 2012 18:40:38 +0100 Subject: [PATCH] IOLoop cleanup --- couchpotato/api.py | 7 +++++-- couchpotato/runner.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/couchpotato/api.py b/couchpotato/api.py index 15ef2b4..718527c 100644 --- a/couchpotato/api.py +++ b/couchpotato/api.py @@ -1,6 +1,5 @@ from flask.blueprints import Blueprint from flask.helpers import url_for -from tornado.ioloop import IOLoop from tornado.web import RequestHandler, asynchronous from werkzeug.utils import redirect @@ -11,7 +10,11 @@ api_nonblock = {} class NonBlockHandler(RequestHandler): - stoppers = [] + + def __init__(self, application, request, **kwargs): + cls = NonBlockHandler + cls.stoppers = [] + super(NonBlockHandler, self).__init__(application, request, **kwargs) @asynchronous def get(self, route): diff --git a/couchpotato/runner.py b/couchpotato/runner.py index f55c65b..c0b7eb8 100644 --- a/couchpotato/runner.py +++ b/couchpotato/runner.py @@ -4,7 +4,6 @@ from couchpotato.api import api, NonBlockHandler from couchpotato.core.event import fireEventAsync, fireEvent from couchpotato.core.helpers.variable import getDataDir, tryInt from logging import handlers -from tornado.ioloop import IOLoop from tornado.web import Application, FallbackHandler from tornado.wsgi import WSGIContainer from werkzeug.contrib.cache import FileSystemCache @@ -231,6 +230,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En fireEventAsync('app.load') # Go go go! + from tornado.ioloop import IOLoop web_container = WSGIContainer(app) web_container._log = _log loop = IOLoop.instance()