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

machine: fix supervisord active state reporting 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-02-08 17:00:39 -05:00
parent 25d2ad4af6
commit 8c7b93c6dd
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
moonraker/components/machine.py
View File

@ -1300,13 +1300,21 @@ class SupervisordCliProvider(BaseProvider):
timeout=timeout, success_codes=success_codes timeout=timeout, success_codes=success_codes
) )
def _get_active_state(self, sub_state: str) -> str:
if sub_state == "stopping":
return "deactivating"
elif sub_state == "running":
return "active"
else:
return "inactive"
async def _detect_active_services(self) -> None: async def _detect_active_services(self) -> None:
machine: Machine = self.server.lookup_component("machine") machine: Machine = self.server.lookup_component("machine")
units: Dict[str, Any] = await self._get_process_info() units: Dict[str, Any] = await self._get_process_info()
for unit, info in units.items(): for unit, info in units.items():
if machine.is_service_allowed(unit): if machine.is_service_allowed(unit):
self.available_services[unit] = { self.available_services[unit] = {
'active_state': "active", 'active_state': self._get_active_state(info["state"]),
'sub_state': info["state"] 'sub_state': info["state"]
} }
@ -1357,7 +1365,7 @@ class SupervisordCliProvider(BaseProvider):
for svc, state in zip(svcs, resp_l): for svc, state in zip(svcs, resp_l):
sub_state = state.split()[1].lower() sub_state = state.split()[1].lower()
new_state: Dict[str, str] = { new_state: Dict[str, str] = {
'active_state': "active", 'active_state': self._get_active_state(sub_state),
'sub_state': sub_state 'sub_state': sub_state
} }
if self.available_services[svc] != new_state: if self.available_services[svc] != new_state: