Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use the global logger in the auto reload worker

Browse Source
This commit is contained in:
Kovid Goyal 2015-10-19 21:06:46 +05:30
parent a65b9126fa
commit 663cad94b6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/srv/auto_reload.py
View File

@ -33,7 +33,7 @@ class WatcherBase(object):
modified = {os.path.relpath(x, self.base) if x.startswith(self.base) else x for x in modified if x} modified = {os.path.relpath(x, self.base) if x.startswith(self.base) else x for x in modified if x}
changed = os.pathsep.join(sorted(modified)) changed = os.pathsep.join(sorted(modified))
self.log('') self.log('')
self.log('Restarting server because of changed files:', changed) self.log.warn('Restarting server because of changed files:', changed)
self.log('') self.log('')
self.server.restart() self.server.restart()
self.last_restart_time = time.time() self.last_restart_time = time.time()
@ -188,8 +188,9 @@ def join_process(p, timeout=5):
class Worker(object): class Worker(object):
def __init__(self, cmd, timeout=5): def __init__(self, cmd, log, timeout=5):
self.cmd = cmd self.cmd = cmd
self.log = log
self.p = None self.p = None
self.timeout = timeout self.timeout = timeout
@ -226,8 +227,8 @@ class Worker(object):
time.sleep(0.01) time.sleep(0.01)
compile_srv() compile_srv()
except CompileFailure as e: except CompileFailure as e:
print(e.message, file=sys.stderr) self.log.error(e.message)
print('Retrying in one second') self.log('Retrying in one second')
time.sleep(1) time.sleep(1)
continue continue
break break
@ -246,7 +247,7 @@ def auto_reload(log, dirs=frozenset(), cmd=None, add_default_dirs=True):
dirs = find_dirs_to_watch(fpath, dirs, add_default_dirs) dirs = find_dirs_to_watch(fpath, dirs, add_default_dirs)
log('Auto-restarting server on changes press Ctrl-C to quit') log('Auto-restarting server on changes press Ctrl-C to quit')
log('Watching %d directory trees for changes' % len(dirs)) log('Watching %d directory trees for changes' % len(dirs))
with Worker(cmd) as server: with Worker(cmd, log) as server:
w = Watcher(dirs, server, log) w = Watcher(dirs, server, log)
try: try:
w.loop() w.loop()