arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-04-24 07:17:17 +00:00
Code Issues Projects Releases Wiki Activity

fix: use event instead of chained timer for daemon

Browse Source 
Old solution causes amount of thread to be growing as well as stack is
increased during each iteration. Instead of cycle-free implementation,
this commit just uses while cycle
This commit is contained in:
Evgenii Alekseev 2023-11-30 13:40:59 +02:00
parent aef3cb95bc
commit a689448854
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ahriman/application/handlers/daemon.py
View File

@ -43,8 +43,10 @@ class Daemon(Handler):
report(bool): force enable or disable reporting
"""
from ahriman.application.handlers import Update
Update.run(args, repository_id, configuration, report=report)
timer = threading.Timer(args.interval, Daemon.run, args=[args, repository_id, configuration],
kwargs={"report": report})
timer.start()
timer.join()
event = threading.Event()
try:
while not event.wait(args.interval):
Update.run(args, repository_id, configuration, report=report)
except KeyboardInterrupt:
pass # normal exit

20
tests/ahriman/application/handlers/test_handler_daemon.py
View File

@ -1,6 +1,7 @@
import argparse
from pytest_mock import MockerFixture
from unittest.mock import call as MockCall
from ahriman.application.handlers import Daemon
from ahriman.core.configuration import Configuration
@ -30,11 +31,22 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
"""
args = _default_args(args)
run_mock = mocker.patch("ahriman.application.handlers.Update.run")
start_mock = mocker.patch("threading.Timer.start")
join_mock = mocker.patch("threading.Timer.join")
wait_mock = mocker.patch("threading.Event.wait", side_effect=[False, True])
_, repository_id = configuration.check_loaded()
Daemon.run(args, repository_id, configuration, report=True)
run_mock.assert_called_once_with(args, repository_id, configuration, report=True)
start_mock.assert_called_once_with()
join_mock.assert_called_once_with()
wait_mock.assert_has_calls([MockCall(args.interval), MockCall(args.interval)])
def test_run_keyboard_interrupt(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
"""
must handle KeyboardInterrupt exception
"""
args = _default_args(args)
mocker.patch("ahriman.application.handlers.Update.run", side_effect=KeyboardInterrupt)
wait_mock = mocker.patch("threading.Event.wait", return_value=False)
_, repository_id = configuration.check_loaded()
Daemon.run(args, repository_id, configuration, report=True)
wait_mock.assert_called_once_with(args.interval)