Merge pull request #256 from my8100/release_v160

Release v1.6.0 and use scrapydweb_settings_v11.py

Author: my8100

HISTORY.md

@@ -13,7 +13,7 @@
 from .__version__ import __url__, __version__
 from .common import handle_metadata
 from .models import Metadata, db
-from .vars import PYTHON_VERSION, SQLALCHEMY_BINDS, SQLALCHEMY_DATABASE_URI
+from .vars import PYTHON_VERSION, SCRAPY_VERSION, SCRAPYD_VERSION, SQLALCHEMY_BINDS, SQLALCHEMY_DATABASE_URI
 # from .utils.scheduler import scheduler
 
 
@@ -54,6 +54,8 @@ def internal_server_error(error):
         python_version=PYTHON_VERSION,
         scrapydweb_version=__version__,
         logparser_version=LOGPARSER_VERSION,
+        scrapy_version=SCRAPY_VERSION,
+        scrapyd_version=SCRAPYD_VERSION,
         scrapyd_servers_amount=len(current_app.config.get('SCRAPYD_SERVERS', []))
     )
     return render_template('500.html', **kwargs), 500
@@ -308,6 +310,8 @@ def inject_variable():
             GITHUB_URL=__url__,
             PYTHON_VERSION=PYTHON_VERSION,
             SCRAPYDWEB_VERSION=__version__,
+            SCRAPY_VERSION=SCRAPY_VERSION,
+            SCRAPYD_VERSION=SCRAPYD_VERSION,
 
             # static_css_common=url_for(STATIC, filename='%s/css/common.css' % VERSION),
             static_css_dropdown=url_for(STATIC, filename='%s/css/dropdown.css' % VERSION),

scrapydweb/__init__.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 __title__ = 'scrapydweb'
-__version__ = '1.5.2'
+__version__ = '1.6.0'
 __author__ = 'my8100'
 __author_email__ = '[email protected]'
 __url__ = 'https://github.com/my8100/scrapydweb'

scrapydweb/__version__.py

@@ -51,6 +51,8 @@
     ('username', 'password', 'localhost', '6801', 'group'),
 ]
 
+# The default is True, set it to False to skip checking connectivity of scrapyd at startup.
+CHECK_SCRAPYD_SERVERS = True
 
 # It's recommended to update the three options below
 # if both ScrapydWeb and one of your Scrapyd servers run on the same machine.

scrapydweb/default_settings.py

@@ -183,6 +183,13 @@ def parse_args(config):
         help="current: ENABLE_AUTH = %s, append '--disable_auth' to disable basic auth for web UI" % ENABLE_AUTH
     )
 
+    CHECK_SCRAPYD_SERVERS = config.get('CHECK_SCRAPYD_SERVERS', True)
+    parser.add_argument(
+        '-dc', '--disable_check_scrapyd',
+        action='store_true',
+        help="current: CHECK_SCRAPYD_SERVERS = %s, append '--disable_check_scrapyd' skip checking connectivity of scrapyd" % CHECK_SCRAPYD_SERVERS
+    )
+
     ENABLE_LOGPARSER = config.get('ENABLE_LOGPARSER', False)
     parser.add_argument(
         '-dlp', '--disable_logparser',
@@ -240,6 +247,8 @@ def update_app_config(config, args):
     # action='store_true': default False
     if args.disable_auth:
         config['ENABLE_AUTH'] = False
+    if args.disable_check_scrapyd:
+        config['CHECK_SCRAPYD_SERVERS'] = False
     if args.disable_logparser:
         config['ENABLE_LOGPARSER'] = False
     if args.switch_scheduler_state: