Mercurial > piecrust2
changeset 217:1f4c3dae1fe8
bake: Better error handling for site baking.
The site baker now keeps track of whether any worker saw any error. It returns
the current record after a bake.
The `bake` command uses this return value to figure out what kind of exit code
to return.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Sat, 31 Jan 2015 17:35:36 -0800 |
| parents | c5ada46b281a |
| children | 10f24c62b05b |
| files | piecrust/baking/baker.py piecrust/baking/records.py piecrust/commands/builtin/baking.py |
| diffstat | 3 files changed, 26 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/piecrust/baking/baker.py Sat Jan 31 17:33:02 2015 -0800 +++ b/piecrust/baking/baker.py Sat Jan 31 17:35:36 2015 -0800 @@ -61,6 +61,7 @@ logger.debug(format_timed( t, 'loaded previous bake record', colored=False)) + record.current.success = True # Figure out if we need to clean the cache because important things # have changed. @@ -99,6 +100,8 @@ self.app.config.set('baker/is_baking', False) logger.debug(format_timed(start_time, 'done baking')) + return record.detach() + def _handleCacheValidity(self, record): start_time = time.clock() @@ -173,7 +176,8 @@ queue.addJob(BakeWorkerJob(fac, route, entry)) - self._waitOnWorkerPool(pool, abort) + success = self._waitOnWorkerPool(pool, abort) + record.current.success &= success def _bakeTaxonomies(self, record): logger.debug("Baking taxonomies") @@ -270,7 +274,8 @@ queue.addJob( BakeWorkerJob(fac, route, entry, tax_name, term)) - self._waitOnWorkerPool(pool, abort) + success = self._waitOnWorkerPool(pool, abort) + record.current.success &= success def _handleDeletetions(self, record): for path, reason in record.getDeletions(): @@ -299,9 +304,11 @@ for w in pool: w.start() + success = True try: for w in pool: w.join() + success &= w.success except KeyboardInterrupt: logger.warning("Bake aborted by user... " "waiting for workers to stop.") @@ -322,6 +329,8 @@ log_friendly_exception(logger, e) raise BakingError("Baking was aborted due to errors.") + return success + class BakeWorkerContext(object): def __init__(self, app, out_dir, force, record, work_queue, @@ -354,6 +363,7 @@ self.wid = wid self.ctx = ctx self.abort_exception = None + self.success = True self._page_baker = PageBaker( ctx.app, ctx.out_dir, ctx.force, ctx.record) @@ -367,12 +377,14 @@ "[%d] No more work... shutting down." % self.wid) break - self._unsafeRun(job) + success = self._unsafeRun(job) logger.debug("[%d] Done with page." % self.wid) self.ctx.work_queue.onJobFinished(job) + self.success &= success except Exception as ex: self.ctx.abort_event.set() self.abort_exception = ex + self.success = False logger.debug("[%d] Critical error, aborting." % self.wid) if self.ctx.app.debug: logger.exception(ex) @@ -393,6 +405,11 @@ entry.errors.append(str(ex)) ex = ex.__cause__ + if entry.errors: + for e in entry.errors: + logger.error(e) + return False + if entry.was_baked_successfully: uri = entry.out_uris[0] friendly_uri = uri if uri != '' else '[main page]' @@ -402,7 +419,6 @@ logger.info(format_timed( start_time, '[%d] %s%s' % (self.wid, friendly_uri, friendly_count))) - elif entry.errors: - for e in entry.errors: - logger.error(e) + return True +
--- a/piecrust/baking/records.py Sat Jan 31 17:33:02 2015 -0800 +++ b/piecrust/baking/records.py Sat Jan 31 17:35:36 2015 -0800 @@ -20,12 +20,13 @@ class BakeRecord(Record): - RECORD_VERSION = 8 + RECORD_VERSION = 9 def __init__(self): super(BakeRecord, self).__init__() self.out_dir = None self.bake_time = None + self.success = True FLAG_NONE = 0
--- a/piecrust/commands/builtin/baking.py Sat Jan 31 17:33:02 2015 -0800 +++ b/piecrust/commands/builtin/baking.py Sat Jan 31 17:35:36 2015 -0800 @@ -65,8 +65,8 @@ baker = Baker( ctx.app, out_dir, force=ctx.args.force) - baker.bake() - return True + record = baker.bake() + return record.success def _bakeAssets(self, ctx, out_dir): proc = ProcessorPipeline(