Skip to content

Commit ca2fe01

Browse files
committed
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
1 parent d6f6645 commit ca2fe01

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

nova/config.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,8 @@
3333

3434

3535
def rabbit_heartbeat_filter(log_record):
36-
37-
# Note the type in the log message was fixed in
38-
# change Id11db4113c9b1c3add602192c1e915218704ef27
39-
# but we handle both form to allow this to be backported
40-
# without consideration of the version of oslo.messaging used.
41-
# TODO(sean-k-mooney): remove support for typo in follow up
42-
# to allow this to be easily backported without modification.
43-
messages = [
44-
"Unexpected error during heartbeart thread processing",
45-
"Unexpected error during heartbeat thread processing"]
46-
return not any(msg in log_record.msg for msg in messages)
36+
message = "Unexpected error during heartbeat thread processing"
37+
return message not in log_record.msg
4738

4839

4940
def parse_args(argv, default_config_files=None, configure_db=True,

0 commit comments

Comments
 (0)