GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 17:20:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

renamed device to rtc

Browse Source
This commit is contained in:
Maxim Devaev 2021-09-26 09:31:54 +03:00
parent 2a0ed6a92c
commit 51ed538415
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kvmd/apps/__init__.py
View File

@ -694,7 +694,7 @@ def _get_config_scheme() -> Dict:
}, },
"watchdog": { "watchdog": {
"device": Option(0, type=valid_int_f0), "rtc": Option(0, type=valid_int_f0),
"timeout": Option(300, type=valid_int_f1), "timeout": Option(300, type=valid_int_f1),
"interval": Option(30, type=valid_int_f1), "interval": Option(30, type=valid_int_f1),
}, },

30
kvmd/apps/watchdog/__init__.py
View File

@ -42,27 +42,27 @@ class RtcIsNotAvailableError(Exception):
# ===== # =====
def _join_rtc(device: int, key: str) -> str: def _join_rtc(rtc: int, key: str) -> str:
return f"{env.SYSFS_PREFIX}/sys/class/rtc/rtc{device}/{key}" return f"{env.SYSFS_PREFIX}/sys/class/rtc/rtc{rtc}/{key}"
def _read_int(device: int, key: str) -> int: def _read_int(rtc: int, key: str) -> int:
with open(_join_rtc(device, key)) as value_file: with open(_join_rtc(rtc, key)) as value_file:
return int(value_file.read().strip() or "0") return int(value_file.read().strip() or "0")
def _write_int(device: int, key: str, value: int) -> None: def _write_int(rtc: int, key: str, value: int) -> None:
with open(_join_rtc(device, key), "w") as value_file: with open(_join_rtc(rtc, key), "w") as value_file:
value_file.write(str(value)) value_file.write(str(value))
def _reset_alarm(device: int, timeout: int) -> None: def _reset_alarm(rtc: int, timeout: int) -> None:
now = _read_int(device, "since_epoch") now = _read_int(rtc, "since_epoch")
if now == 0: if now == 0:
raise RtcIsNotAvailableError("Current UNIX time == 0") raise RtcIsNotAvailableError("Current UNIX time == 0")
try: try:
for wake in [0, now + timeout]: for wake in [0, now + timeout]:
_write_int(device, "wakealarm", wake) _write_int(rtc, "wakealarm", wake)
except OSError as err: except OSError as err:
if err.errno != errno.EIO: if err.errno != errno.EIO:
raise raise
@ -72,30 +72,30 @@ def _reset_alarm(device: int, timeout: int) -> None:
# ===== # =====
def _cmd_run(config: Section) -> None: def _cmd_run(config: Section) -> None:
logger = get_logger(0) logger = get_logger(0)
logger.info("Running watchdog loop on RTC%d ...", config.device) logger.info("Running watchdog loop on RTC%d ...", config.rtc)
fail = False fail = False
try: try:
while True: while True:
try: try:
_reset_alarm(config.device, config.timeout) _reset_alarm(config.rtc, config.timeout)
except RtcIsNotAvailableError as err: except RtcIsNotAvailableError as err:
if not fail: if not fail:
logger.error("RTC%d is not available now: %s; waiting ...", config.device, err) logger.error("RTC%d is not available now: %s; waiting ...", config.rtc, err)
fail = True fail = True
else: else:
if fail: if fail:
logger.info("RTC%d is available, working ...", config.device) logger.info("RTC%d is available, working ...", config.rtc)
fail = False fail = False
time.sleep(config.interval) time.sleep(config.interval)
except (SystemExit, KeyboardInterrupt): except (SystemExit, KeyboardInterrupt):
if not fail: if not fail:
_reset_alarm(config.device, config.timeout) _reset_alarm(config.rtc, config.timeout)
logger.info("The watchdog remains alarmed. Use 'kvmd-watchdog cancel' to disarm it") logger.info("The watchdog remains alarmed. Use 'kvmd-watchdog cancel' to disarm it")
logger.info("Bye-bye") logger.info("Bye-bye")
def _cmd_cancel(config: Section) -> None: def _cmd_cancel(config: Section) -> None:
_write_int(config.device, "wakealarm", 0) _write_int(config.rtc, "wakealarm", 0)
# ===== # =====