[airflow] 03/05: Fix failing tests from #8997 (#9576)

[kaxilnaik]

This is an automated email from the ASF dual-hosted git repository.

kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit b6307eff8fc38c72714fa1d5784bbdc3640641ea
Author: Kamil Breguła <mik-...@users.noreply.github.com>
AuthorDate: Mon Jun 29 21:02:44 2020 +0200

    Fix failing tests from #8997 (#9576)
    
    (cherry picked from commit 9858294f7252e626bec7b701280e81d4f27df452)
---
 airflow/bin/cli.py                           | 4 +++-
 airflow/config_templates/config.yml          | 4 ++--
 airflow/config_templates/default_airflow.cfg | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/airflow/bin/cli.py b/airflow/bin/cli.py
index b81c7b1..ba19561 100644
--- a/airflow/bin/cli.py
+++ b/airflow/bin/cli.py
@@ -1135,7 +1135,9 @@ def webserver(args):
                 master_timeout=conf.getint('webserver', 
'web_server_master_timeout'),
                 worker_refresh_interval=conf.getint('webserver', 
'worker_refresh_interval', fallback=10),
                 worker_refresh_batch_size=conf.getint('webserver', 
'worker_refresh_batch_size', fallback=1),
-                reload_on_plugin_change=conf.getint('webserver', 
'reload_on_plugin_change', fallback=1),
+                reload_on_plugin_change=conf.getboolean(
+                    'webserver', 'reload_on_plugin_change', fallback=False
+                ),
             ).start()
 
         if args.daemon:
diff --git a/airflow/config_templates/config.yml 
b/airflow/config_templates/config.yml
index 1f697b1..f632cd5 100644
--- a/airflow/config_templates/config.yml
+++ b/airflow/config_templates/config.yml
@@ -701,12 +701,12 @@
       default: "30"
     - name: reload_on_plugin_change
       description: |
-        If set to True, Airflow will track files in plugins_follder directory. 
When it detects changes,
+        If set to True, Airflow will track files in plugins_folder directory. 
When it detects changes,
         then reload the gunicorn.
       version_added: ~
       type: boolean
       example: ~
-      default: False
+      default: "False"
     - name: secret_key
       description: |
         Secret key used to run your flask app
diff --git a/airflow/config_templates/default_airflow.cfg 
b/airflow/config_templates/default_airflow.cfg
index cfc92ad..a061d46 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -341,9 +341,9 @@ worker_refresh_batch_size = 1
 # Number of seconds to wait before refreshing a batch of workers.
 worker_refresh_interval = 30
 
-# If set to True, Airflow will track files in plugins_follder directory. When 
it detects changes,
+# If set to True, Airflow will track files in plugins_folder directory. When 
it detects changes,
 # then reload the gunicorn.
-reload_on_plugin_change =
+reload_on_plugin_change = False
 
 # Secret key used to run your flask app
 # It should be as random as possible