From a170716d3fc19dc0abf41ff69733ac503c71f757 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 7 Nov 2016 18:36:18 +0100 Subject: [PATCH] Convert nonblocking_notify value from string to boolean Otherwise just setting it to "False" which is a string and therefore, is True, enables it! (cherry picked from commit 87bd49b62e0e68d8be7c4f77d60eac19c14f9592) Change-Id: I1155e1a16ccd34ffb0cd1e966e0bef91f6257b6d --- ceilometermiddleware/swift.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ceilometermiddleware/swift.py b/ceilometermiddleware/swift.py index f9c7605..e2f0748 100644 --- a/ceilometermiddleware/swift.py +++ b/ceilometermiddleware/swift.py @@ -50,6 +50,7 @@ import logging from oslo_config import cfg import oslo_messaging +from oslo_utils import strutils from oslo_utils import timeutils from pycadf import event as cadf_event from pycadf.helper import api @@ -142,7 +143,8 @@ class Swift(object): # For backward compatibility we default to False and therefore wait for # sending to complete. This causes swift proxy to hang if the # destination is unavailable. - self.nonblocking_notify = conf.get('nonblocking_notify', False) + self.nonblocking_notify = strutils.bool_from_string( + conf.get('nonblocking_notify', False)) # Initialize the sending queue and thread, but only once if self.nonblocking_notify and Swift.event_queue is None: