From 2e261fdc420120c648ff8187595388b30a825b89 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 13 Dec 2021 14:54:16 +1100 Subject: [PATCH] zuul-*: use multiline formatter Zuul change I6d7e7e7a9e19d46a744f9ffac8d532fc6b4bba01 introduced a multi-line formatter that makes exceptions and other multi-line output much easier to follow in the logs. Use it here for the simple formatter in the production Zuul deployment. Change-Id: I9a8aad8a90f5f4080cdb872d0ed65697a180f57c --- playbooks/roles/zuul-executor/files/logging.conf | 1 + playbooks/roles/zuul-merger/files/logging.conf | 1 + playbooks/roles/zuul-scheduler/files/gearman-logging.conf | 1 + playbooks/roles/zuul-scheduler/files/logging.conf | 1 + playbooks/roles/zuul-web/files/fingergw-logging.conf | 1 + playbooks/roles/zuul-web/files/logging.conf | 1 + 6 files changed, 6 insertions(+) diff --git a/playbooks/roles/zuul-executor/files/logging.conf b/playbooks/roles/zuul-executor/files/logging.conf index 5a67076c6c..5ebd7311c8 100644 --- a/playbooks/roles/zuul-executor/files/logging.conf +++ b/playbooks/roles/zuul-executor/files/logging.conf @@ -47,3 +47,4 @@ args=('/var/log/zuul/executor.log',) [formatter_simple] format=%(asctime)s %(levelname)s %(name)s: %(message)s datefmt= +class=zuul.lib.logutil.MultiLineFormatter diff --git a/playbooks/roles/zuul-merger/files/logging.conf b/playbooks/roles/zuul-merger/files/logging.conf index 1807f2a427..83c41ec183 100644 --- a/playbooks/roles/zuul-merger/files/logging.conf +++ b/playbooks/roles/zuul-merger/files/logging.conf @@ -47,3 +47,4 @@ args=('/var/log/zuul/merger.log',) [formatter_simple] format=%(asctime)s %(levelname)s %(name)s: %(message)s datefmt= +class=zuul.lib.logutil.MultiLineFormatter diff --git a/playbooks/roles/zuul-scheduler/files/gearman-logging.conf b/playbooks/roles/zuul-scheduler/files/gearman-logging.conf index c662068b62..fd15139bbb 100644 --- a/playbooks/roles/zuul-scheduler/files/gearman-logging.conf +++ b/playbooks/roles/zuul-scheduler/files/gearman-logging.conf @@ -31,3 +31,4 @@ args=('/var/log/zuul/gearman-server.log',) [formatter_simple] format=%(asctime)s %(levelname)s %(name)s: %(message)s datefmt= +class=zuul.lib.logutil.MultiLineFormatter diff --git a/playbooks/roles/zuul-scheduler/files/logging.conf b/playbooks/roles/zuul-scheduler/files/logging.conf index a219bc267a..27bc8698e3 100644 --- a/playbooks/roles/zuul-scheduler/files/logging.conf +++ b/playbooks/roles/zuul-scheduler/files/logging.conf @@ -62,3 +62,4 @@ args=('/var/log/zuul/zuul.log',) [formatter_simple] format=%(asctime)s %(levelname)s %(name)s: %(message)s datefmt= +class=zuul.lib.logutil.MultiLineFormatter diff --git a/playbooks/roles/zuul-web/files/fingergw-logging.conf b/playbooks/roles/zuul-web/files/fingergw-logging.conf index aefbf9efed..89742361f2 100644 --- a/playbooks/roles/zuul-web/files/fingergw-logging.conf +++ b/playbooks/roles/zuul-web/files/fingergw-logging.conf @@ -47,3 +47,4 @@ args=('/var/log/zuul/fingergw.log',) [formatter_simple] format=%(asctime)s %(levelname)s %(name)s: %(message)s datefmt= +class=zuul.lib.logutil.MultiLineFormatter diff --git a/playbooks/roles/zuul-web/files/logging.conf b/playbooks/roles/zuul-web/files/logging.conf index 9480c96b2e..639e7872a3 100644 --- a/playbooks/roles/zuul-web/files/logging.conf +++ b/playbooks/roles/zuul-web/files/logging.conf @@ -52,3 +52,4 @@ args=('/var/log/zuul/web.log',) [formatter_simple] format=%(asctime)s %(levelname)s %(name)s: %(message)s datefmt= +class=zuul.lib.logutil.MultiLineFormatter