Mercurial > piecrust2

diff piecrust/baking/baker.py @ 453:8351a77e13f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bake: Don't pass the previous record entries to the workers. Workers now load the previous record on their own and find the previous entry in their own copy.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 07 Jul 2015 20:19:54 -0700
parents 838f3964f400
children 5e902e228053
line wrap: on
line diff
--- a/piecrust/baking/baker.py	Tue Jul 07 19:58:07 2015 -0700
+++ b/piecrust/baking/baker.py	Tue Jul 07 20:19:54 2015 -0700
@@ -72,7 +72,9 @@
 
         # Figure out if we need to clean the cache because important things
         # have changed.
-        self._handleCacheValidity(record)
+        is_cache_valid = self._handleCacheValidity(record)
+        if not is_cache_valid:
+            previous_record_path = None
 
         # Pre-create all caches.
         for cache_name in ['app', 'baker', 'pages', 'renders']:
@@ -88,7 +90,7 @@
             srclist.append(source)
 
         # Create the worker processes.
-        pool = self._createWorkerPool()
+        pool = self._createWorkerPool(previous_record_path)
 
         # Bake the realms.
         realm_list = [REALM_USER, REALM_THEME]
@@ -179,11 +181,13 @@
             logger.info(format_timed(
                     start_time,
                     "cleaned cache (reason: %s)" % reason))
+            return False
         else:
             record.incremental_count += 1
             logger.debug(format_timed(
                     start_time, "cache is assumed valid",
                     colored=False))
+            return True
 
     def _bakeRealm(self, record, pool, realm, srclist):
         start_time = time.perf_counter()
@@ -511,7 +515,6 @@
                         'factory_info': save_factory(fac),
                         'taxonomy_info': tax_info,
                         'route_metadata': route_metadata,
-                        'prev_entry': prev_entry,
                         'dirty_source_names': record.dirty_source_names
                         }
                 }
@@ -535,12 +538,13 @@
         for e in errors:
             logger.error("  " + e)
 
-    def _createWorkerPool(self):
+    def _createWorkerPool(self, previous_record_path):
         from piecrust.workerpool import WorkerPool
         from piecrust.baking.worker import BakeWorkerContext, BakeWorker
 
         ctx = BakeWorkerContext(
                 self.app.root_dir, self.app.cache.base_dir, self.out_dir,
+                previous_record_path=previous_record_path,
                 force=self.force, debug=self.app.debug)
         pool = WorkerPool(
                 worker_class=BakeWorker,