shutdown the active crawler on SIGINT. fixes scrapy#450

Author: dangra

scrapy/crawler.py

@@ -81,6 +81,7 @@ def __init__(self, settings):
         self.settings = settings
         self.crawlers = {}
         self.stopping = False
+        self._started = None
 
     def create_crawler(self, name=None):
         if name not in self.crawlers:
@@ -95,8 +96,8 @@ def start(self):
     @defer.inlineCallbacks
     def stop(self):
         self.stopping = True
-        for crawler in self.crawlers.itervalues():
-            yield crawler.stop()
+        if self._active_crawler:
+            yield self._active_crawler.stop()
 
     def _signal_shutdown(self, signum, _):
         install_shutdown_handlers(self._signal_kill)
@@ -130,20 +131,20 @@ def start_reactor(self):
         reactor.run(installSignalHandlers=False)  # blocking call
 
     def _start_crawler(self):
-        if self.crawlers and not self.stopping:
-            name, crawler = self.crawlers.popitem()
-
-            sflo = log.start_from_crawler(crawler)
-            crawler.configure()
-            crawler.install()
-            crawler.signals.connect(crawler.uninstall, signals.engine_stopped)
-            if sflo:
-                crawler.signals.connect(sflo.stop, signals.engine_stopped)
-
-            crawler.signals.connect(self._check_done, signals.engine_stopped)
-            crawler.start()
+        if not self.crawlers or self.stopping:
+            return
 
-            return name, crawler
+        name, crawler = self.crawlers.popitem()
+        self._active_crawler = crawler
+        sflo = log.start_from_crawler(crawler)
+        crawler.configure()
+        crawler.install()
+        crawler.signals.connect(crawler.uninstall, signals.engine_stopped)
+        if sflo:
+            crawler.signals.connect(sflo.stop, signals.engine_stopped)
+        crawler.signals.connect(self._check_done, signals.engine_stopped)
+        crawler.start()
+        return name, crawler
 
     def _check_done(self, **kwargs):
         if not self._start_crawler():