Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removed use of deprecated LOG.warn method"

Browse Source
This commit is contained in:
Jenkins
2016-01-18 17:08:58 +00:00
committed by Gerrit Code Review
parent facca13dc4 dfc9a3b37d
commit 65cf19a7e4
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/common/messaging/messaging_handler.py
View File

@@ -94,7 +94,7 @@ class MessagingHandler(threading.Thread):
) )
self.__server = self.build_server(target) self.__server = self.build_server(target)
else: else:
LOG.warn( LOG.warning(
_LW("No endpoint defined; can only publish events")) _LW("No endpoint defined; can only publish events"))
except Exception as e: except Exception as e:
LOG.exception(e) LOG.exception(e)

5
watcher/common/utils.py
View File

@@ -50,8 +50,9 @@ def safe_rstrip(value, chars=None):
""" """
if not isinstance(value, six.string_types): if not isinstance(value, six.string_types):
LOG.warn(_LW("Failed to remove trailing character. Returning original " LOG.warning(_LW(
"object. Supplied object is not a string: %s,"), value) "Failed to remove trailing character. Returning original object."
"Supplied object is not a string: %s,"), value)
return value return value
return value.rstrip(chars) or value return value.rstrip(chars) or value

2
watcher/decision_engine/model/mapping.py
View File

@@ -72,7 +72,7 @@ class Mapping(object):
# remove vm # remove vm
self.mapping_vm.pop(vm_uuid) self.mapping_vm.pop(vm_uuid)
else: else:
LOG.warn( LOG.warning(
"trying to delete the virtual machine {0} but it was not " "trying to delete the virtual machine {0} but it was not "
"found on hypervisor {1}".format( "found on hypervisor {1}".format(
vm_uuid, node_uuid)) vm_uuid, node_uuid))