netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2024-09-21 23:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add timeout for init operations

Browse source
This commit is contained in:
Orsiris de Jong 2023-04-02 16:00:21 +02:00
parent 5baacb31f1
commit ba6847dd98
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
npbackup/restic_wrapper/__init__.py
View file

@ -7,8 +7,8 @@ __intname__ = "npbackup.restic_wrapper"
__author__ = "Orsiris de Jong" __author__ = "Orsiris de Jong"
__copyright__ = "Copyright (C) 2022-2023 NetInvent" __copyright__ = "Copyright (C) 2022-2023 NetInvent"
__license__ = "GPL-3.0-only" __license__ = "GPL-3.0-only"
__build__ = "2023032901" __build__ = "2023040201"
__version__ = "1.6.0" __version__ = "1.6.1"
from typing import Tuple, List, Optional, Callable, Union from typing import Tuple, List, Optional, Callable, Union
@ -24,6 +24,9 @@ from command_runner import command_runner
logger = getLogger(__intname__) logger = getLogger(__intname__)
# Arbitrary timeout for init / init checks.
# If init takes more than a minute, we really have a problem
INIT_TIMEOUT=60
class ResticRunner: class ResticRunner:
def __init__( def __init__(
@ -170,6 +173,7 @@ class ResticRunner:
self, self,
cmd: str, cmd: str,
errors_allowed: bool = False, errors_allowed: bool = False,
timeout: int = None,
live_stream=False, live_stream=False,
) -> Tuple[bool, str]: ) -> Tuple[bool, str]:
""" """
@ -188,7 +192,7 @@ class ResticRunner:
if live_stream: if live_stream:
exit_code, output = command_runner( exit_code, output = command_runner(
_cmd, _cmd,
timeout=None, timeout=timeout,
split_streams=False, split_streams=False,
encoding="utf-8", encoding="utf-8",
live_output=self.verbose, live_output=self.verbose,
@ -203,7 +207,7 @@ class ResticRunner:
else: else:
exit_code, output = command_runner( exit_code, output = command_runner(
_cmd, _cmd,
timeout=None, timeout=timeout,
split_streams=False, split_streams=False,
encoding="utf-8", encoding="utf-8",
live_output=self.verbose, live_output=self.verbose,
@ -410,7 +414,7 @@ class ResticRunner:
cmd = "init --repository-version {} --compression {}".format( cmd = "init --repository-version {} --compression {}".format(
repository_version, compression repository_version, compression
) )
result, output = self.executor(cmd, errors_allowed=errors_allowed) result, output = self.executor(cmd, errors_allowed=errors_allowed, timeout=INIT_TIMEOUT)
if result: if result:
if re.search( if re.search(
r"created restic repository ([a-z0-9]+) at .+", output, re.IGNORECASE r"created restic repository ([a-z0-9]+) at .+", output, re.IGNORECASE