airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From saguz...@apache.org
Subject incubator-airflow git commit: [AIRFLOW-1352][AIRFLOW-1335] Revert MemoryHandler change ()[]
Date Tue, 27 Jun 2017 23:17:47 GMT
Repository: incubator-airflow
Updated Branches:
  refs/heads/master d32c72969 -> e414844b7


[AIRFLOW-1352][AIRFLOW-1335] Revert MemoryHandler change ()[]

Revert "[AIRFLOW-1335] Use MemoryHandler for
buffered logging"
This reverts commit
0d23d30d6812fe1eb3cfb52d2992131cbf028062.

Closes #2403 from saguziel/aguziel-revert-mem-
logger


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/e414844b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/e414844b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/e414844b

Branch: refs/heads/master
Commit: e414844b7cd1b1a279f9d5f4c70b8aaa37eee27d
Parents: d32c729
Author: Alex Guziel <alex.guziel@airbnb.com>
Authored: Tue Jun 27 16:17:38 2017 -0700
Committer: Alex Guziel <alex.guziel@airbnb.com>
Committed: Tue Jun 27 16:17:38 2017 -0700

----------------------------------------------------------------------
 airflow/bin/cli.py                           | 5 +----
 airflow/config_templates/default_airflow.cfg | 7 -------
 airflow/config_templates/default_test.cfg    | 2 --
 3 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/e414844b/airflow/bin/cli.py
----------------------------------------------------------------------
diff --git a/airflow/bin/cli.py b/airflow/bin/cli.py
index d4ddcb5..4b3a0ed 100755
--- a/airflow/bin/cli.py
+++ b/airflow/bin/cli.py
@@ -90,10 +90,7 @@ def sigquit_handler(sig, frame):
 
 def setup_logging(filename):
     root = logging.getLogger()
-    handler_buffer_size = conf.getInt('core', 'logging_buffer_size')
-    handler_flush_level = conf.getInt('core', 'logging_flush_level')
-    # Buffered wrapper
-    handler = logging.MemoryHandler(handler_buffer_size, handler_flush_level, target=logging.FileHandler(filename))
+    handler = logging.FileHandler(filename)
     formatter = logging.Formatter(settings.SIMPLE_LOG_FORMAT)
     handler.setFormatter(formatter)
     root.addHandler(handler)

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/e414844b/airflow/config_templates/default_airflow.cfg
----------------------------------------------------------------------
diff --git a/airflow/config_templates/default_airflow.cfg b/airflow/config_templates/default_airflow.cfg
index dc13a1e..ddd1ba8 100644
--- a/airflow/config_templates/default_airflow.cfg
+++ b/airflow/config_templates/default_airflow.cfg
@@ -55,13 +55,6 @@ log_format_with_pid = [%%(asctime)s] [%%(process)d] {{%%(filename)s:%%(lineno)d}
 log_format_with_thread_name = [%%(asctime)s] {{%%(filename)s:%%(lineno)d}} %%(threadName)s
%%(levelname)s - %%(message)s
 simple_log_format = %%(asctime)s %%(levelname)s - %%(message)s
 
-# Size of logging buffer
-logging_buffer_size = 4096
-# Logging level minimum to flush buffer before full
-# See python doc on core module logging, DEBUG=10,INFO=20,WARN=30,ERROR=40
-# default to no buffering
-logging_flush_level = 0
-
 # The executor class that airflow should use. Choices include
 # SequentialExecutor, LocalExecutor, CeleryExecutor, DaskExecutor
 executor = SequentialExecutor

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/e414844b/airflow/config_templates/default_test.cfg
----------------------------------------------------------------------
diff --git a/airflow/config_templates/default_test.cfg b/airflow/config_templates/default_test.cfg
index 1c0d34c..2fb5bb0 100644
--- a/airflow/config_templates/default_test.cfg
+++ b/airflow/config_templates/default_test.cfg
@@ -29,8 +29,6 @@ dags_folder = {TEST_DAGS_FOLDER}
 plugins_folder = {TEST_PLUGINS_FOLDER}
 base_log_folder = {AIRFLOW_HOME}/logs
 logging_level = INFO
-logging_flush_level = 0
-logging_buffer_size = 4096
 executor = SequentialExecutor
 sql_alchemy_conn = sqlite:///{AIRFLOW_HOME}/unittests.db
 load_examples = True


Mime
View raw message