summaryrefslogtreecommitdiff
path: root/nova/config.py
diff options
context:
space:
mode:
authorSean Mooney <work@seanmooney.info>2020-04-30 19:09:17 +0100
committerSean Mooney <work@seanmooney.info>2020-05-07 19:54:23 +0100
commitca2fe01cc1c73e9ca7b2376ea566db0fe45a44ea (patch)
tree43f4aab58114953da6a58f1b49d6f1b78bbae7fd /nova/config.py
parentd6f664524dfa4eecbe3e16fda0fec5359faf84c6 (diff)
downloadnova-ca2fe01cc1c73e9ca7b2376ea566db0fe45a44ea.tar.gz
remove support of oslo.messaging 9.8.0 warning message
This change removes support for supressing the heartbeat message from olso.messaging before 9.8.0 Change-Id: I2035d5df31e43b730cd472cc438ec863bb538d62 Related-Bug: #1825584
Diffstat (limited to 'nova/config.py')
-rw-r--r--nova/config.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/nova/config.py b/nova/config.py
index 4fbb77e854..f39e8554d3 100644
--- a/nova/config.py
+++ b/nova/config.py
@@ -33,17 +33,8 @@ CONF = nova.conf.CONF
def rabbit_heartbeat_filter(log_record):
-
- # Note the type in the log message was fixed in
- # change Id11db4113c9b1c3add602192c1e915218704ef27
- # but we handle both form to allow this to be backported
- # without consideration of the version of oslo.messaging used.
- # TODO(sean-k-mooney): remove support for typo in follow up
- # to allow this to be easily backported without modification.
- messages = [
- "Unexpected error during heartbeart thread processing",
- "Unexpected error during heartbeat thread processing"]
- return not any(msg in log_record.msg for msg in messages)
+ message = "Unexpected error during heartbeat thread processing"
+ return message not in log_record.msg
def parse_args(argv, default_config_files=None, configure_db=True,