netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-11-12 23:23:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Make NTP offset configurable, allow fix potential bad log line

Browse source
This commit is contained in:
deajan 2025-03-28 09:06:54 +01:00
parent f38f43756b
commit fa61dcbbb2
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
npbackup/__env__.py
View file

@ -34,6 +34,9 @@ FAST_COMMANDS_TIMEOUT = 180
# # Wait x seconds before we actually do the upgrade so current program could quit before being erased
UPGRADE_DEFER_TIME = 60
# Maximum allowed time offset in seconds to allow policy operations to run
MAX_ALLOWED_NTP_OFFSET = 600.0
if not "BUILD_TYPE" in globals():
BUILD_TYPE = "UnknownBuildType"

10
npbackup/core/runner.py
View file

@ -37,6 +37,7 @@ from npbackup.core import jobs
from npbackup.path_helper import CURRENT_DIR, BASEDIR
from npbackup.__version__ import __intname__ as NAME, version_dict
from npbackup.__debug__ import _DEBUG, exception_to_string
from npbackup.__env__ import MAX_ALLOWED_NTP_OFFSET
logger = logging.getLogger()
@ -238,8 +239,10 @@ def get_ntp_offset(ntp_server: str) -> Optional[float]:
return response.offset
except ntplib.NTPException as exc:
logger.error(f"Cannot get NTP offset from {ntp_server}: {exc}")
logger.debug("Trace:", exc_info=True)
except Exception as exc:
logger.error(f"Cannot reach NTP server {ntp_server}: {exc}")
logger.debug("Trace:", exc_info=True)
return None
@ -1623,8 +1626,11 @@ class NPBackupRunner:
f"Checking time against ntp server {ntp_server}", level="info"
)
offset = get_ntp_offset(ntp_server)
if not offset or offset >= 600:
msg = f"Offset from NTP server {ntp_server} is too high: {int(offset)} seconds. Won't apply policy"
if not offset or offset > float(MAX_ALLOWED_NTP_OFFSET):
if not offset:
msg = f"Offset cannot be obtained from NTP server {ntp_server}"
elif offset > float(MAX_ALLOWED_NTP_OFFSET):
msg = f"Offset from NTP server {ntp_server} is too high: {offset} seconds. Won't apply policy"
self.write_logs(msg, level="critical")
return self.convert_to_json_output(False, msg)