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

fix config file handling

Browse Source
This commit is contained in:
Thomas Oettli
2020-11-01 22:49:34 +01:00
parent 61bed11a65
commit 73d720dcc2
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pyinotifyd.py
View File

@@ -275,10 +275,15 @@ def main():
args = parser.parse_args() args = parser.parse_args()
LOGLEVEL = logging.INFO default_config = {
WATCHES = [] "watches": [],
"loglevel": logging.INFO,
"shutdown_timeout": 30}
cfg = {"pyinotifyd_config": default_config}
with open(args.config, "r") as c: with open(args.config, "r") as c:
exec(c.read(), globals()) exec(c.read(), globals(), cfg)
cfg = cfg["pyinotifyd_config"]
console = logging.StreamHandler() console = logging.StreamHandler()
formatter = logging.Formatter( formatter = logging.Formatter(
@@ -286,12 +291,10 @@ def main():
console.setFormatter(formatter) console.setFormatter(formatter)
if args.debug: if args.debug:
loglevel = logging.DEBUG cfg["loglevel"] = logging.DEBUG
else:
loglevel = LOGLEVEL
root_logger = logging.getLogger() root_logger = logging.getLogger()
root_logger.setLevel(loglevel) root_logger.setLevel(cfg["loglevel"])
root_logger.addHandler(console) root_logger.addHandler(console)
watchable_flags = pyinotify.EventsCodes.OP_FLAGS watchable_flags = pyinotify.EventsCodes.OP_FLAGS
@@ -300,7 +303,7 @@ def main():
wm = pyinotify.WatchManager() wm = pyinotify.WatchManager()
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
notifiers = [] notifiers = []
for watch in WATCHES: for watch in cfg["watches"]:
mask = False mask = False
handler = pyinotify.ProcessEvent() handler = pyinotify.ProcessEvent()
for flag, values in watch["event_map"].items(): for flag, values in watch["event_map"].items():
@@ -320,6 +323,7 @@ def main():
setattr(handler, f"process_{flag}", exec_list.run) setattr(handler, f"process_{flag}", exec_list.run)
logging.info(f"start watching {watch['path']}")
wm.add_watch( wm.add_watch(
watch["path"], mask, rec=watch["rec"], auto_add=watch["auto_add"], watch["path"], mask, rec=watch["rec"], auto_add=watch["auto_add"],
do_glob=True) do_glob=True)
@@ -334,7 +338,7 @@ def main():
for notifier in notifiers: for notifier in notifiers:
notifier.stop() notifier.stop()
loop.run_until_complete(shutdown()) loop.run_until_complete(shutdown(timeout=cfg["shutdown_timeout"]))
loop.close() loop.close()
sys.exit(0) sys.exit(0)