Repository: incubator-airflow Updated Branches: refs/heads/master 9565a9879 -> fdd7f43fe
Revert "[AIRFLOW-1955] Do not reference unassigned variable" This reverts commit 9565a9879280d83c6c3987d3a6f8b8933168cedf. Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/fdd7f43f Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/fdd7f43f Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/fdd7f43f Branch: refs/heads/master Commit: fdd7f43fe2aa64bc9001db4f2555c59d568e249a Parents: 9565a98 Author: Fokko Driesprong <fokkodriespr...@godatadriven.com> Authored: Thu Dec 28 22:04:40 2017 +0100 Committer: Fokko Driesprong <fokkodriespr...@godatadriven.com> Committed: Thu Dec 28 22:04:40 2017 +0100 ---------------------------------------------------------------------- airflow/utils/log/gcs_task_handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/fdd7f43f/airflow/utils/log/gcs_task_handler.py ---------------------------------------------------------------------- diff --git a/airflow/utils/log/gcs_task_handler.py b/airflow/utils/log/gcs_task_handler.py index 3b83c8c..f68165f 100644 --- a/airflow/utils/log/gcs_task_handler.py +++ b/airflow/utils/log/gcs_task_handler.py @@ -138,10 +138,10 @@ class GCSTaskHandler(FileTaskHandler, LoggingMixin): if append: try: old_log = self.gcs_read(remote_log_location) - log = '\n'.join([old_log, log]) if old_log else log except Exception as e: if not hasattr(e, 'resp') or e.resp.get('status') != '404': - log = '*** Previous log discarded: {}\n\n'.format(str(e)) + log + old_log = '*** Previous log discarded: {}\n\n'.format(str(e)) + log = '\n'.join([old_log, log]) if old_log else log try: bkt, blob = self.parse_gcs_url(remote_log_location)
