Skip to content

Commit

Permalink
only catch Exception, and specifically not GeneratorExit, inside inli…
Browse files Browse the repository at this point in the history
…neCallbacks

Refs #2395.
  • Loading branch information
djmitche committed Nov 14, 2012
1 parent a99dc97 commit cda112b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions master/buildbot/process/botmaster.py
Expand Up @@ -404,7 +404,7 @@ def _maybeStartBuildsOn(self, new_builders):
# start the activity loop, if we aren't already working on that.
if not self.active:
self._activityLoop()
except:
except Exception:
log.err(Failure(),
"while attempting to start builds on %s" % self.name)

Expand Down Expand Up @@ -460,7 +460,7 @@ def _sortBuilders(self, buildernames):
try:
builders = yield defer.maybeDeferred(lambda :
sorter(self.master, builders))
except:
except Exception:
log.msg("Exception prioritizing builders; order unspecified")
log.err(Failure())

Expand Down Expand Up @@ -493,7 +493,7 @@ def _activityLoop(self):

try:
yield self._callABuilder(bldr_name)
except:
except Exception:
log.err(Failure(),
"from maybeStartBuild for builder '%s'" % (bldr_name,))

Expand Down

0 comments on commit cda112b

Please sign in to comment.