spacefreak/pyinotifyd
1
0
Fork 0
Code Issues Pull Requests Releases Activity

add signal handling and fix some stuff

Browse Source
This commit is contained in:
Thomas Oettli
2020-11-03 16:24:53 +01:00
parent dcfee23198
commit 81f9447709
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pyinotifyd.py
View File

@@ -22,6 +22,7 @@ import os
import pyinotify import pyinotify
import re import re
import shutil import shutil
import signal
import sys import sys
from shlex import quote as shell_quote from shlex import quote as shell_quote
@@ -290,7 +291,7 @@ class FileManager:
if match is not None: if match is not None:
try: try:
if rule.action in ["copy", "move"]: if rule.action in ["copy", "move"]:
dest = src_re.sub(rule.dst_re, path) dest = rule.src_re.sub(rule.dst_re, path)
if not dest: if not dest:
raise RuntimeError( raise RuntimeError(
f"unable to {rule.action} '{path}', " f"unable to {rule.action} '{path}', "
@@ -306,8 +307,8 @@ class FileManager:
f"destination path exists already") f"destination path exists already")
self._log.info( self._log.info(
f"{task_id}: {action} '{path}' to '{dest}'") f"{task_id}: {rule.action} '{path}' to '{dest}'")
if action == "copy": if rule.action == "copy":
if os.path.isdir(path): if os.path.isdir(path):
shutil.copytree(path, dest) shutil.copytree(path, dest)
else: else:
@@ -317,7 +318,7 @@ class FileManager:
elif rule.action == "delete": elif rule.action == "delete":
self._log.info( self._log.info(
f"{task_id}: delete '{path}'") f"{task_id}: {rule.action} '{path}'")
if os.path.isdir(path): if os.path.isdir(path):
if rule.rec: if rule.rec:
shutil.rmtree(path) shutil.rmtree(path)
@@ -361,7 +362,11 @@ class PyinotifydConfig:
f"watches: expected {type(Watch)}, got {type(watch)}" f"watches: expected {type(Watch)}, got {type(watch)}"
async def shutdown(timeout=30): async def shutdown(signame, notifiers, timeout=30):
logging.info(f"got signal {signame}, shutdown ...")
for notifier in notifiers:
notifier.stop()
pending = [t for t in asyncio.all_tasks() pending = [t for t in asyncio.all_tasks()
if t is not asyncio.current_task()] if t is not asyncio.current_task()]
if len(pending) > 0: if len(pending) > 0:
@@ -378,6 +383,7 @@ async def shutdown(timeout=30):
future.exception() future.exception()
logging.info("shutdown") logging.info("shutdown")
asyncio.get_event_loop().stop()
def main(): def main():
@@ -439,15 +445,14 @@ def main():
logging.info(f"start watching '{watch.path}'") logging.info(f"start watching '{watch.path}'")
notifiers.append(watch.event_notifier(wm, loop)) notifiers.append(watch.event_notifier(wm, loop))
try: for signame in ["SIGINT", "SIGTERM"]:
loop.add_signal_handler(getattr(signal, signame),
lambda: asyncio.ensure_future(
shutdown(signame, notifiers, timeout=cfg.shutdown_timeout)))
loop.run_forever() loop.run_forever()
except KeyboardInterrupt:
pass
for notifier in notifiers:
notifier.stop()
loop.run_until_complete(shutdown(timeout=cfg.shutdown_timeout))
loop.close() loop.close()
sys.exit(0) sys.exit(0)