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

machine: fix typos and clarify supervisord docs 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-11-18 10:42:44 -05:00
parent 48f3bb2189
commit 362bc1a3d3
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/configuration.md
View File

@ -142,9 +142,10 @@ force_validation:
# at validation successfully completed. Setting this value to True will force # at validation successfully completed. Setting this value to True will force
# Moonraker to perform validation. The default is False. # Moonraker to perform validation. The default is False.
supervisord_config_path: supervisord_config_path:
# Path to the superrvisord config file. In case for multi supervisord instance # Path to the supervisord config file. This is required when for multiple
# running on single machine, the default '/var/run/supervisord.sock' is occupied # supervisord are instances running on single machine and the default
# by other services. # '/var/run/supervisord.sock' is occupied by other services.
# The default is no path.
``` ```
!!! Note !!! Note

6
moonraker/components/machine.py
View File

@ -109,7 +109,7 @@ class Machine:
"none": BaseProvider, "none": BaseProvider,
"systemd_cli": SystemdCliProvider, "systemd_cli": SystemdCliProvider,
"systemd_dbus": SystemdDbusProvider, "systemd_dbus": SystemdDbusProvider,
"supervisord": SuperisordProvider "supervisord": SupervisordProvider
} }
self.provider_type = config.get('provider', 'systemd_dbus') self.provider_type = config.get('provider', 'systemd_dbus')
pclass = providers.get(self.provider_type) pclass = providers.get(self.provider_type)
@ -1175,7 +1175,7 @@ class SystemdDbusProvider(BaseProvider):
# for docker klipper-moonraker image multi-service managing # for docker klipper-moonraker image multi-service managing
# since in container, all command is launched by normal user, # since in container, all command is launched by normal user,
# sudo_cmd is not needed. # sudo_cmd is not needed.
class SuperisordProvider(BaseProvider): class SupervisordProvider(BaseProvider):
def __init__(self, config: ConfigHelper) -> None: def __init__(self, config: ConfigHelper) -> None:
super().__init__(config) super().__init__(config)
self.spv_conf: str = config.get("supervisord_config_path", "") self.spv_conf: str = config.get("supervisord_config_path", "")
@ -1225,7 +1225,7 @@ class SuperisordProvider(BaseProvider):
os.path.exists("/.dockerinit") os.path.exists("/.dockerinit")
): ):
virt_id = "docker" virt_id = "docker"
virt_type = "docker" virt_type = "container"
return { return {
'virt_type': virt_type, 'virt_type': virt_type,
'virt_identifier': virt_id 'virt_identifier': virt_id