mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-04 21:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

catch errors during execution of hook, do not raise exception but log error

Browse source
This commit is contained in:
Peter Bieringer 2024-11-23 21:34:07 +01:00
parent e4daddc186
commit 6f2c1037d5
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
radicale/storage/multifilesystem/lock.py
View file

@ -75,27 +75,35 @@ class StoragePartLock(StorageBase):
preexec_fn = os.setpgrp preexec_fn = os.setpgrp
command = self._hook % { command = self._hook % {
"user": shlex.quote(user or "Anonymous")} "user": shlex.quote(user or "Anonymous")}
logger.debug("Running storage hook") logger.debug("Executing storage hook: '%s'" % command)
try:
p = subprocess.Popen( p = subprocess.Popen(
command, stdin=subprocess.DEVNULL, command, stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE if debug else subprocess.DEVNULL, stdout=subprocess.PIPE if debug else subprocess.DEVNULL,
stderr=subprocess.PIPE if debug else subprocess.DEVNULL, stderr=subprocess.PIPE if debug else subprocess.DEVNULL,
shell=True, universal_newlines=True, preexec_fn=preexec_fn, shell=True, universal_newlines=True, preexec_fn=preexec_fn,
cwd=self._filesystem_folder, creationflags=creationflags) cwd=self._filesystem_folder, creationflags=creationflags)
except Exception as e:
logger.error("Execution of storage hook not successful on 'Popen': %s" % e)
return
logger.debug("Executing storage hook started 'Popen'")
try: try:
stdout_data, stderr_data = p.communicate() stdout_data, stderr_data = p.communicate()
except BaseException: # e.g. KeyboardInterrupt or SystemExit except BaseException as e: # e.g. KeyboardInterrupt or SystemExit
logger.error("Execution of storage hook not successful on 'communicate': %s" % e)
p.kill() p.kill()
p.wait() p.wait()
raise return
finally: finally:
if sys.platform != "win32": if sys.platform != "win32":
# Kill remaining children identified by process group # Kill remaining children identified by process group
with contextlib.suppress(OSError): with contextlib.suppress(OSError):
os.killpg(p.pid, signal.SIGKILL) os.killpg(p.pid, signal.SIGKILL)
logger.debug("Executing storage hook finished")
if stdout_data: if stdout_data:
logger.debug("Captured stdout from hook:\n%s", stdout_data) logger.debug("Captured stdout from storage hook:\n%s", stdout_data)
if stderr_data: if stderr_data:
logger.debug("Captured stderr from hook:\n%s", stderr_data) logger.debug("Captured stderr from storage hook:\n%s", stderr_data)
if p.returncode != 0: if p.returncode != 0:
raise subprocess.CalledProcessError(p.returncode, p.args) logger.error("Execution of storage hook not successful: %s" % subprocess.CalledProcessError(p.returncode, p.args))
return