zuul
/
zuul
Code Issues Proposed changes

Merge "Catch gear.InterruptedError" into feature/zuulv3

This commit is contained in:
Jenkins 2017-03-06 18:55:16 +00:00 committed by Gerrit Code Review
parent df1f701cb7 39a4a9f48c
commit 91c2fd1efd
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zuul/merger/server.py
View File

@ -100,6 +100,8 @@ class MergeServer(object):
except Exception:
self.log.exception("Exception while running job")
job.sendWorkException(traceback.format_exc())
except gear.InterruptedError:
return
except Exception:
self.log.exception("Exception while getting job")

2
zuul/rpclistener.py
View File

@ -81,6 +81,8 @@ class RPCListener(object):
job.sendWorkFail()
else:
job.sendWorkFail()
except gear.InterruptedError:
return
except Exception:
self.log.exception("Exception while getting job")