3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update_manager: replace PeriodicCallback 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-12-09 14:45:52 -05:00
parent 511c91829a
commit 56a98aa8ed
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
moonraker/components/update_manager/update_manager.py
View File

@ -15,7 +15,6 @@ import shutil
import zipfile import zipfile
import time import time
import tempfile import tempfile
from tornado.ioloop import PeriodicCallback
from tornado.httpclient import AsyncHTTPClient from tornado.httpclient import AsyncHTTPClient
from .base_deploy import BaseDeploy from .base_deploy import BaseDeploy
from .app_deploy import AppDeploy from .app_deploy import AppDeploy
@ -43,6 +42,7 @@ if TYPE_CHECKING:
from components.shell_command import ShellCommandFactory as SCMDComp from components.shell_command import ShellCommandFactory as SCMDComp
from components.database import MoonrakerDatabase as DBComp from components.database import MoonrakerDatabase as DBComp
from components.database import NamespaceWrapper from components.database import NamespaceWrapper
from eventloop import FlexTimer
JsonType = Union[List[Any], Dict[str, Any]] JsonType = Union[List[Any], Dict[str, Any]]
MOONRAKER_PATH = os.path.normpath(os.path.join( MOONRAKER_PATH = os.path.normpath(os.path.join(
@ -53,7 +53,7 @@ KLIPPER_DEFAULT_PATH = os.path.expanduser("~/klipper")
KLIPPER_DEFAULT_EXEC = os.path.expanduser("~/klippy-env/bin/python") KLIPPER_DEFAULT_EXEC = os.path.expanduser("~/klippy-env/bin/python")
# Check To see if Updates are necessary each hour # Check To see if Updates are necessary each hour
UPDATE_REFRESH_INTERVAL_MS = 3600000 UPDATE_REFRESH_INTERVAL = 3600.
# Perform auto refresh no later than 4am # Perform auto refresh no later than 4am
MAX_UPDATE_HOUR = 4 MAX_UPDATE_HOUR = 4
@ -140,11 +140,10 @@ class UpdateManager:
self.klippy_identified_evt: Optional[asyncio.Event] = None self.klippy_identified_evt: Optional[asyncio.Event] = None
# Auto Status Refresh # Auto Status Refresh
self.refresh_cb: Optional[PeriodicCallback] = None self.refresh_timer: Optional[FlexTimer] = None
if auto_refresh_enabled: if auto_refresh_enabled:
self.refresh_cb = PeriodicCallback( self.refresh_timer = self.event_loop.register_timer(
self._handle_auto_refresh, # type: ignore self._handle_auto_refresh)
UPDATE_REFRESH_INTERVAL_MS)
self.server.register_endpoint( self.server.register_endpoint(
"/machine/update/moonraker", ["POST"], "/machine/update/moonraker", ["POST"],
@ -180,8 +179,8 @@ class UpdateManager:
if updater.needs_refresh(): if updater.needs_refresh():
ret = updater.refresh() ret = updater.refresh()
await ret await ret
if self.refresh_cb is not None: if self.refresh_timer is not None:
self.refresh_cb.start() self.refresh_timer.start()
async def _set_klipper_repo(self) -> None: async def _set_klipper_repo(self) -> None:
if self.klippy_identified_evt is not None: if self.klippy_identified_evt is not None:
@ -225,16 +224,15 @@ class UpdateManager:
pstate: str = result.get('print_stats', {}).get('state', "") pstate: str = result.get('print_stats', {}).get('state', "")
return pstate.lower() == "printing" return pstate.lower() == "printing"
async def _handle_auto_refresh(self) -> None: async def _handle_auto_refresh(self, eventtime: float) -> float:
cur_hour = time.localtime(eventtime).tm_hour
# Update when the local time is between 12AM and 5AM
if cur_hour >= MAX_UPDATE_HOUR:
return eventtime + UPDATE_REFRESH_INTERVAL
if await self._check_klippy_printing(): if await self._check_klippy_printing():
# Don't Refresh during a print # Don't Refresh during a print
logging.info("Klippy is printing, auto refresh aborted") logging.info("Klippy is printing, auto refresh aborted")
return return eventtime + UPDATE_REFRESH_INTERVAL
cur_time = time.time()
cur_hour = time.localtime(cur_time).tm_hour
# Update when the local time is between 12AM and 5AM
if cur_hour >= MAX_UPDATE_HOUR:
return
vinfo: Dict[str, Any] = {} vinfo: Dict[str, Any] = {}
async with self.cmd_request_lock: async with self.cmd_request_lock:
try: try:
@ -243,11 +241,12 @@ class UpdateManager:
vinfo[name] = updater.get_update_status() vinfo[name] = updater.get_update_status()
except Exception: except Exception:
logging.exception("Unable to Refresh Status") logging.exception("Unable to Refresh Status")
return return eventtime + UPDATE_REFRESH_INTERVAL
uinfo = self.cmd_helper.get_rate_limit_stats() uinfo = self.cmd_helper.get_rate_limit_stats()
uinfo['version_info'] = vinfo uinfo['version_info'] = vinfo
uinfo['busy'] = self.cmd_helper.is_update_busy() uinfo['busy'] = self.cmd_helper.is_update_busy()
self.server.send_event("update_manager:update_refreshed", uinfo) self.server.send_event("update_manager:update_refreshed", uinfo)
return eventtime + UPDATE_REFRESH_INTERVAL
async def _handle_update_request(self, async def _handle_update_request(self,
web_request: WebRequest web_request: WebRequest
@ -436,8 +435,8 @@ class UpdateManager:
def close(self) -> None: def close(self) -> None:
self.cmd_helper.close() self.cmd_helper.close()
if self.refresh_cb is not None: if self.refresh_timer is not None:
self.refresh_cb.stop() self.refresh_timer.stop()
class CommandHelper: class CommandHelper:
def __init__(self, config: ConfigHelper) -> None: def __init__(self, config: ConfigHelper) -> None: