reformat source

This commit is contained in:
2020-11-04 15:24:08 +01:00
parent b6839808dc
commit 6feaf9d2b2

View File

@@ -128,9 +128,9 @@ class TaskScheduler:
if path in self._tasks: if path in self._tasks:
task = self._tasks[path] task = self._tasks[path]
self._log.info(f"received event {maskname} on '{path}', " self._log.info(
f"re-schedule task {task.task_id} " f"received event {maskname} on '{path}', "
f"(delay={self._delay}s)") f"re-schedule task {task.task_id} (delay={self._delay}s)")
task.restart() task.restart()
else: else:
task_id = str(uuid4()) task_id = str(uuid4())
@@ -150,7 +150,8 @@ class TaskScheduler:
maskname = event.maskname.split("|", 1)[0] maskname = event.maskname.split("|", 1)[0]
if path in self._tasks: if path in self._tasks:
task = self._tasks[path] task = self._tasks[path]
self._log.info(f"received event {maskname} on '{path}', " self._log.info(
f"received event {maskname} on '{path}', "
f"cancel scheduled task {task.task_id}") f"cancel scheduled task {task.task_id}")
task.cancel() task.cancel()
del self._tasks[path] del self._tasks[path]
@@ -183,7 +184,8 @@ class ShellScheduler(TaskScheduler):
class EventMap: class EventMap:
flags = {**pyinotify.EventsCodes.OP_FLAGS, flags = {
**pyinotify.EventsCodes.OP_FLAGS,
**pyinotify.EventsCodes.EVENT_FLAGS} **pyinotify.EventsCodes.EVENT_FLAGS}
def __init__(self, event_map=None, default_task=None): def __init__(self, event_map=None, default_task=None):
@@ -253,7 +255,8 @@ class Watch:
else: else:
mask = EventMap.flags[flag] mask = EventMap.flags[flag]
wm.add_watch(self.path, mask, rec=self.rec, auto_add=self.auto_add, wm.add_watch(
self.path, mask, rec=self.rec, auto_add=self.auto_add,
do_glob=True) do_glob=True)
return pyinotify.AsyncioNotifier(wm, loop, default_proc_fun=handler) return pyinotify.AsyncioNotifier(wm, loop, default_proc_fun=handler)
@@ -558,7 +561,9 @@ def main():
for signame in ["SIGINT", "SIGTERM"]: for signame in ["SIGINT", "SIGTERM"]:
loop.add_signal_handler( loop.add_signal_handler(
getattr(signal, signame), lambda: asyncio.ensure_future(shutdown( getattr(signal, signame),
lambda: asyncio.ensure_future(
shutdown(
signame, notifiers, myname, timeout=cfg.shutdown_timeout))) signame, notifiers, myname, timeout=cfg.shutdown_timeout)))
loop.run_forever() loop.run_forever()