Merge "Fix CleanupWorker exception messages" into feature/zuulv3

This commit is contained in:
Jenkins 2017-05-12 14:33:16 +00:00 committed by Gerrit Code Review
commit dabb6d0a96

View File

@ -1196,19 +1196,19 @@ class CleanupWorker(BaseCleanupWorker):
self._cleanupNodeRequestLocks() self._cleanupNodeRequestLocks()
except Exception: except Exception:
self.log.exception( self.log.exception(
"Exception in DeletedNodeWorker (node request lock cleanup):") "Exception in CleanupWorker (node request lock cleanup):")
try: try:
self._cleanupLeakedInstances() self._cleanupLeakedInstances()
except Exception: except Exception:
self.log.exception( self.log.exception(
"Exception in DeletedNodeWorker (leaked instance cleanup):") "Exception in CleanupWorker (leaked instance cleanup):")
try: try:
self._cleanupLostRequests() self._cleanupLostRequests()
except Exception: except Exception:
self.log.exception( self.log.exception(
"Exception in DeletedNodeWorker (lost request cleanup):") "Exception in CleanupWorker (lost request cleanup):")
class DeletedNodeWorker(BaseCleanupWorker): class DeletedNodeWorker(BaseCleanupWorker):