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

moonraker: add "/server/info" endpoint 

This method provides basic server information, such as loaded plugins and the state of the UDS connection to Klippy.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-09-26 06:29:02 -04:00
parent 6905515f3d
commit 756492f349
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
moonraker/moonraker.py
View File

@ -67,6 +67,9 @@ class Server:
self.register_upload_handler = app.register_upload_handler self.register_upload_handler = app.register_upload_handler
self.ioloop = IOLoop.current() self.ioloop = IOLoop.current()
self.register_endpoint(
"/server/info", ['GET'], self._handle_info_request)
# Setup remote methods accessable to Klippy. Note that all # Setup remote methods accessable to Klippy. Note that all
# registered remote methods should be of the notification type, # registered remote methods should be of the notification type,
# they do not return a response to Klippy after execution # they do not return a response to Klippy after execution
@ -261,11 +264,10 @@ class Server:
'log_file', 'config_file']} 'log_file', 'config_file']}
file_manager = self.lookup_plugin('file_manager') file_manager = self.lookup_plugin('file_manager')
file_manager.update_fixed_paths(fixed_paths) file_manager.update_fixed_paths(fixed_paths)
is_ready = result.get('state', "") == "ready" self.klippy_state = result.get('state', "unknown")
if is_ready: if self.klippy_state == "ready":
await self._verify_klippy_requirements() await self._verify_klippy_requirements()
logging.info("Klippy ready") logging.info("Klippy ready")
self.klippy_state = "ready"
self.init_list.append('klippy_ready') self.init_list.append('klippy_ready')
self.send_event("server:klippy_ready") self.send_event("server:klippy_ready")
elif self.init_attempts % LOG_ATTEMPT_INTERVAL == 0 and \ elif self.init_attempts % LOG_ATTEMPT_INTERVAL == 0 and \
@ -361,6 +363,12 @@ class Server:
await self.moonraker_app.close() await self.moonraker_app.close()
self.ioloop.stop() self.ioloop.stop()
async def _handle_info_request(self, path, method, args):
return {
'klippy_connected': self.klippy_connection.is_connected(),
'klippy_state': self.klippy_state,
'plugins': list(self.plugins.keys())}
class KlippyConnection: class KlippyConnection:
def __init__(self, on_recd, on_close): def __init__(self, on_recd, on_close):
self.ioloop = IOLoop.current() self.ioloop = IOLoop.current()