diff --git a/scrapydweb/run.py b/scrapydweb/run.py index cdb9c2bf..efa7f3de 100644 --- a/scrapydweb/run.py +++ b/scrapydweb/run.py @@ -110,13 +110,12 @@ def inject_variable(): protocol = 'http' context = None - print("{star}Visit ScrapydWeb at {protocol}://127.0.0.1:{port} " - "or {protocol}://IP-OF-THE-CURRENT-HOST:{port}{star}\n".format( - star=STAR, protocol=protocol, port=app.config['SCRAPYDWEB_PORT'])) + logger.info("{star}Visit ScrapydWeb at {protocol}://127.0.0.1:{port} " + "or {protocol}://IP-OF-THE-CURRENT-HOST:{port}{star}\n".format( + star=STAR, protocol=protocol, port=app.config['SCRAPYDWEB_PORT'])) logger.info("For running Flask in production, check out http://flask.pocoo.org/docs/1.0/deploying/") apscheduler_logger.setLevel(logging.DEBUG) - app.run(host=app.config['SCRAPYDWEB_BIND'], port=app.config['SCRAPYDWEB_PORT'], - ssl_context=context, use_reloader=False) + return app def load_custom_settings(config): diff --git a/scrapydweb/views/operations/deploy.py b/scrapydweb/views/operations/deploy.py index 7a560009..c4d5a33a 100644 --- a/scrapydweb/views/operations/deploy.py +++ b/scrapydweb/views/operations/deploy.py @@ -76,6 +76,8 @@ def set_scrapy_cfg_list(self): # Python 'ascii' codec can't decode byte try: self.scrapy_cfg_list = glob.glob(os.path.join(self.SCRAPY_PROJECTS_DIR, '*', u'scrapy.cfg')) + if os.path.exists(os.path.join(self.SCRAPY_PROJECTS_DIR, u'scrapy.cfg')): + self.scrapy_cfg_list.append(os.path.join(self.SCRAPY_PROJECTS_DIR, u'scrapy.cfg')) except UnicodeDecodeError: if PY2: for name in os.listdir(os.path.join(self.SCRAPY_PROJECTS_DIR, u'')): @@ -306,8 +308,10 @@ def handle_local_project(self): self.search_scrapy_cfg_path(project_path) if not self.scrapy_cfg_path: - self.scrapy_cfg_not_found = True - return + self.search_scrapy_cfg_path(self.SCRAPY_PROJECTS_DIR) + if not self.scrapy_cfg_path: + self.scrapy_cfg_not_found = True + return self.eggname = '%s_%s.egg' % (self.project, self.version) self.eggpath = os.path.join(self.DEPLOY_PATH, self.eggname)