Merge "Remove unused kill method from Service"

This commit is contained in:
Jenkins 2016-02-29 10:29:05 +00:00 committed by Gerrit Code Review
commit 8b548ce352

View File

@ -269,16 +269,6 @@ class Service(service.Service):
return service_obj return service_obj
def kill(self):
"""Destroy the service object in the datastore."""
self.stop()
try:
service_ref = objects.Service.get_by_id(
context.get_admin_context(), self.service_id)
service_ref.destroy()
except exception.NotFound:
LOG.warning(_LW('Service killed that has no database entry'))
def stop(self): def stop(self):
# Try to shut the connection down, but if we get any sort of # Try to shut the connection down, but if we get any sort of
# errors, go ahead and ignore them.. as we're shutting down anyway # errors, go ahead and ignore them.. as we're shutting down anyway