Merge pull request #1284 from jlowin/fix-remote-base-None

Fix reading strings from conf for remote logging

airflow/bin/cli.py

@@ -246,7 +246,7 @@ def run(args, dag=None):
                 remote_log_location,
                 append=True)
         # Other
-        elif remote_base:
+        elif remote_base and remote_base != 'None':
             logging.error(
                 'Unsupported remote log location: {}'.format(remote_base))
 

airflow/configuration.py

@@ -150,12 +150,12 @@ def run_command(command):
 # must supply a remote location URL (starting with either 's3://...' or
 # 'gs://...') and an Airflow connection id that provides access to the storage
 # location.
-remote_base_log_folder = None
-remote_log_conn_id = None
+remote_base_log_folder =
+remote_log_conn_id =
 # Use server-side encryption for logs stored in S3
 encrypt_s3_logs = False
 # deprecated option for remote log storage, use remote_base_log_folder instead!
-# s3_log_folder = None
+# s3_log_folder =
 
 # The executor class that airflow should use. Choices include
 # SequentialExecutor, LocalExecutor, CeleryExecutor

airflow/utils/logging.py

@@ -105,7 +105,7 @@ def write(self, log, remote_log_location, append=False):
                     log,
                     key=remote_log_location,
                     replace=True,
-                    encrypt=configuration.get('core', 'ENCRYPT_S3_LOGS'))
+                    encrypt=configuration.get_bool('core', 'ENCRYPT_S3_LOGS'))
                 return
             except:
                 pass