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

improve logging again

Browse Source
This commit is contained in:
Thomas Oettli
2020-11-04 23:58:52 +01:00
parent ad97547568
commit 0b8e32fe53
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -44,7 +44,7 @@ rule = Rule(
fm = FileManager( fm = FileManager(
rules=[rule], rules=[rule],
logname="FileManager") logname="filemanager")
``` ```
FileManager provides a task **fm.task**. FileManager provides a task **fm.task**.
@@ -60,7 +60,7 @@ s = TaskScheduler(
files=True, files=True,
dirs=False, dirs=False,
delay=0, delay=0,
logname="TaskScheduler") logname="scheduler")
``` ```
TaskScheduler provides two tasks which can be bound to an event in an event map. TaskScheduler provides two tasks which can be bound to an event in an event map.
* **s.schedule** * **s.schedule**
@@ -115,7 +115,7 @@ pyinotifyd expects an instance of Pyinotifyd named **pyinotifyd** defined in the
pyinotifyd = Pyinotifyd( pyinotifyd = Pyinotifyd(
watches=[watch], watches=[watch],
shutdown_timeout=30, shutdown_timeout=30,
logname="Pyinotifyd") logname="daemon")
``` ```
### Logging ### Logging

4
pyinotifyd/__init__.py
View File

@@ -33,10 +33,10 @@ from pyinotifyd.watch import Watch, EventMap
class Pyinotifyd: class Pyinotifyd:
def __init__(self, watches=[], shutdown_timeout=30, logname=None): def __init__(self, watches=[], shutdown_timeout=30, logname="daemon"):
self.set_watches(watches) self.set_watches(watches)
self.set_shutdown_timeout(shutdown_timeout) self.set_shutdown_timeout(shutdown_timeout)
logname = (logname or "daemon") logname = (logname or __name__)
self._log = logging.getLogger(logname) self._log = logging.getLogger(logname)
self._loop = asyncio.get_event_loop() self._loop = asyncio.get_event_loop()
self._notifiers = [] self._notifiers = []

2
pyinotifyd/filemanager.py
View File

@@ -66,7 +66,7 @@ class Rule:
class FileManager: class FileManager:
def __init__(self, rules, logname=None): def __init__(self, rules, logname="filemgr"):
if not isinstance(rules, list): if not isinstance(rules, list):
rules = [rules] rules = [rules]

9
pyinotifyd/scheduler.py
View File

@@ -20,7 +20,7 @@ from uuid import uuid4
class _Task: class _Task:
def __init__(self, event, delay, task_id, task, callback=None, def __init__(self, event, delay, task_id, task, callback=None,
logname=None): logname="task"):
self._event = event self._event = event
self._path = event.pathname self._path = event.pathname
self._delay = delay self._delay = delay
@@ -59,7 +59,7 @@ class _Task:
class TaskScheduler: class TaskScheduler:
def __init__(self, task, files, dirs, delay=0, logname=None): def __init__(self, task, files, dirs, delay=0, logname="sched"):
assert callable(task), \ assert callable(task), \
f"task: expected callable, got {type(task)}" f"task: expected callable, got {type(task)}"
self._task = task self._task = task
@@ -127,13 +127,12 @@ class TaskScheduler:
class ShellScheduler(TaskScheduler): class ShellScheduler(TaskScheduler):
def __init__(self, cmd, task=None, logname=None, *args, **kwargs): def __init__(self, cmd, task=None, *args, **kwargs):
assert isinstance(cmd, str), \ assert isinstance(cmd, str), \
f"cmd: expected {type('')}, got {type(cmd)}" f"cmd: expected {type('')}, got {type(cmd)}"
self._cmd = cmd self._cmd = cmd
logname = (logname or __name__) super().__init__(*args, task=self.task, **kwargs)
super().__init__(*args, task=self.task, logname=logname, **kwargs)
async def task(self, event, task_id): async def task(self, event, task_id):
maskname = event.maskname.split("|", 1)[0] maskname = event.maskname.split("|", 1)[0]