Mercurial > piecrust2

comparison piecrust/serving/procloop.py @ 680:c2ea75e37540

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
serve: Fix some crashes introduced by recent refactor.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 08 Mar 2016 01:05:39 -0800
parents 81d9c3a3a0b5
children 08e02c2a2a1a
comparison
equal deleted inserted replaced
679:15b6ffadc95f 680:c2ea75e37540
73 self._proc_loop.removeObserver(self) 73 self._proc_loop.removeObserver(self)
74 self._running = 2 74 self._running = 2
75 75
76 76
77 class ProcessingLoop(threading.Thread): 77 class ProcessingLoop(threading.Thread):
78 def __init__(self, appfactory): 78 def __init__(self, appfactory, out_dir):
79 super(ProcessingLoop, self).__init__( 79 super(ProcessingLoop, self).__init__(
80 name='pipeline-reloader', daemon=True) 80 name='pipeline-reloader', daemon=True)
81 self.appfactory = appfactory 81 self.appfactory = appfactory
82 self.out_dir = out_dir
82 self.last_status_id = 0 83 self.last_status_id = 0
83 self.interval = 1 84 self.interval = 1
84 self.app = None 85 self.app = None
85 self._roots = [] 86 self._roots = []
86 self._monitor_assets_root = False 87 self._monitor_assets_root = False
88 self._record = None 89 self._record = None
89 self._last_bake = 0 90 self._last_bake = 0
90 self._last_config_mtime = 0 91 self._last_config_mtime = 0
91 self._obs = [] 92 self._obs = []
92 self._obs_lock = threading.Lock() 93 self._obs_lock = threading.Lock()
93 if appfactory.theme_site: 94 config_name = (
94 self._config_path = os.path.join(root_dir, THEME_CONFIG_PATH) 95 THEME_CONFIG_PATH if appfactory.theme_site else CONFIG_PATH)
95 else: 96 self._config_path = os.path.join(appfactory.root_dir, config_name)
96 self._config_path = os.path.join(root_dir, CONFIG_PATH)
97 97
98 def addObserver(self, obs): 98 def addObserver(self, obs):
99 with self._obs_lock: 99 with self._obs_lock:
100 self._obs.append(obs) 100 self._obs.append(obs)
101 101