diff --git a/scrapy/contrib/webconsole/spiderctl.py b/scrapy/contrib/webconsole/spiderctl.py index 1c0cc2dd3..40224f3e9 100644 --- a/scrapy/contrib/webconsole/spiderctl.py +++ b/scrapy/contrib/webconsole/spiderctl.py @@ -28,8 +28,7 @@ class Spiderctl(object): self.running.add(domain) def domain_closed(self, domain, spider): - if domain in self.running: - self.running.remove(domain) + self.running.remove(domain) self.finished.add(domain) def webconsole_render(self, wc_request): @@ -37,20 +36,19 @@ class Spiderctl(object): changes = self.webconsole_control(wc_request) enabled_domains = spiders.asdict().keys() - self.scheduled = set(scrapyengine.scheduler.pending_domains_count) - self.not_scheduled = [d for d in enabled_domains if d not in self.scheduled + self.scheduled = scrapyengine.domain_scheduler.pending_domains + self.idle = [d for d in enabled_domains if d not in self.scheduled and d not in self.running and d not in self.finished] s = banner(self) - s += '
\n' s += '| Running (%d/%d) | Scheduled (%d) | Finished (%d) | Not scheduled (%d) |
|---|---|---|---|
| Running (%d/%d) | Scheduled (%d) | Finished (%d) | Idle (%d) |
| \n" s += '\n' s += " | \n" - # not scheduled + # idle s += "\n" s += '\n' s += ' | \n' @@ -121,7 +120,8 @@ class Spiderctl(object): s += '\n' s += "\n" @@ -141,10 +141,6 @@ class Spiderctl(object): args = wc_request.args enabled_domains = spiders.asdict().keys() s = "