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

moonraker: track warnings by id 

This makes it possible to remove warnings and prevent duplicates.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-08-06 15:19:34 -04:00
parent 0dd8eee034
commit 0d936d5af0
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
moonraker/moonraker.py
View File

@ -82,7 +82,7 @@ class Server:
self.events: Dict[str, List[FlexCallback]] = {} self.events: Dict[str, List[FlexCallback]] = {}
self.components: Dict[str, Any] = {} self.components: Dict[str, Any] = {}
self.failed_components: List[str] = [] self.failed_components: List[str] = []
self.warnings: List[str] = [] self.warnings: Dict[str, str] = {}
self.klippy_connection = KlippyConnection(config) self.klippy_connection = KlippyConnection(config)
# Tornado Application/Server # Tornado Application/Server
@ -121,7 +121,7 @@ class Server:
return API_VERSION return API_VERSION
def get_warnings(self) -> List[str]: def get_warnings(self) -> List[str]:
return self.warnings return list(self.warnings.values())
def is_running(self) -> bool: def is_running(self) -> bool:
return self.server_running return self.server_running
@ -187,10 +187,18 @@ class Server:
if log and item is not None: if log and item is not None:
logging.info(item) logging.info(item)
def add_warning(self, warning: str, log: bool = True) -> None: def add_warning(
self.warnings.append(warning) self, warning: str, warn_id: Optional[str] = None, log: bool = True
) -> str:
if warn_id is None:
warn_id = str(id(warning))
self.warnings[warn_id] = warning
if log: if log:
logging.warning(warning) logging.warning(warning)
return warn_id
def remove_warning(self, warn_id: str) -> None:
self.warnings.pop(warn_id, None)
# ***** Component Management ***** # ***** Component Management *****
async def _initialize_component(self, name: str, component: Any) -> None: async def _initialize_component(self, name: str, component: Any) -> None:
@ -400,7 +408,7 @@ class Server:
'components': list(self.components.keys()), 'components': list(self.components.keys()),
'failed_components': self.failed_components, 'failed_components': self.failed_components,
'registered_directories': reg_dirs, 'registered_directories': reg_dirs,
'warnings': self.warnings, 'warnings': list(self.warnings.values()),
'websocket_count': wsm.get_count(), 'websocket_count': wsm.get_count(),
'moonraker_version': self.app_args['software_version'], 'moonraker_version': self.app_args['software_version'],
'missing_klippy_requirements': mreqs, 'missing_klippy_requirements': mreqs,