Merge pull request #26 from pymedusa/upstream

Upstream
pymedusa · Feb 26, 2016 · b716f43 · b716f43
2 parents 9335692 + 67d66f8
commit b716f43
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/gui/slick/images/providers/french-adn.png b/gui/slick/images/providers/french-adn.png
diff --git a/gui/slick/images/providers/french-adn_com.png b/gui/slick/images/providers/french-adn_com.png
diff --git a/gui/slick/images/providers/torrentshack.png b/gui/slick/images/providers/torrentshack.png
diff --git a/gui/slick/images/providers/torrentshack_me.png b/gui/slick/images/providers/torrentshack_me.png
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
@@ -88,8 +88,12 @@
 from tornado.web import RequestHandler, HTTPError, authenticated
 from tornado.gen import coroutine
 from tornado.ioloop import IOLoop
-from tornado.concurrent import run_on_executor
+
 from concurrent.futures import ThreadPoolExecutor
+from tornado.process import cpu_count
+
+from tornado.concurrent import run_on_executor
+
 from mako.runtime import UNDEFINED
 
 mako_lookup = None
@@ -255,7 +259,7 @@ def __init__(self, *args, **kwargs):
         super(WebHandler, self).__init__(*args, **kwargs)
         self.io_loop = IOLoop.current()
 
-    executor = ThreadPoolExecutor(50)
+    executor = ThreadPoolExecutor(cpu_count())
 
     @authenticated
     @coroutine