Browse Source

IOLoop callback hanging

pull/4380/head
Ruud 11 years ago
parent
commit
ffcd36cbf4
  1. 11
      couchpotato/api.py

11
couchpotato/api.py

@ -7,7 +7,6 @@ import urllib
from couchpotato.core.helpers.request import getParams from couchpotato.core.helpers.request import getParams
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from tornado.ioloop import IOLoop
from tornado.web import RequestHandler, asynchronous from tornado.web import RequestHandler, asynchronous
@ -34,7 +33,7 @@ def run_async(func):
def run_handler(route, kwargs, callback = None): def run_handler(route, kwargs, callback = None):
try: try:
res = api[route](**kwargs) res = api[route](**kwargs)
IOLoop.current().add_callback(callback, res, route) callback(res, route)
except: except:
log.error('Failed doing api request "%s": %s', (route, traceback.format_exc())) log.error('Failed doing api request "%s": %s', (route, traceback.format_exc()))
callback({'success': False, 'error': 'Failed returning results'}, route) callback({'success': False, 'error': 'Failed returning results'}, route)
@ -129,14 +128,6 @@ class ApiHandler(RequestHandler):
post = get post = get
def on_connection_close(self):
self.unlock()
super(ApiHandler, self).on_connection_close()
def on_finish(self):
self.unlock()
super(ApiHandler, self).on_finish()
def taskFinished(self, result, route): def taskFinished(self, result, route):
if not self.request.connection.stream.closed(): if not self.request.connection.stream.closed():

Loading…
Cancel
Save