From cbef93b3278b2d638c96558271ae62d72ede886a Mon Sep 17 00:00:00 2001 From: Hemna Date: Sat, 22 Jul 2023 16:41:54 -0400 Subject: [PATCH] Ensure fetch-stats ip is a string --- aprsd/cmds/fetch_stats.py | 2 +- aprsd/rpc/client.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/aprsd/cmds/fetch_stats.py b/aprsd/cmds/fetch_stats.py index 6a57d68..7fd1b97 100644 --- a/aprsd/cmds/fetch_stats.py +++ b/aprsd/cmds/fetch_stats.py @@ -51,7 +51,7 @@ def fetch_stats(ctx, ip_address, port, magic_word): console = Console() with console.status(msg): - client = rpc_client.RPCClient(ip_address, port, magic_word) + client = rpc_client.RPCClient(str(ip_address), port, magic_word) stats = client.get_stats_dict() console.print_json(data=stats) aprsd_title = ( diff --git a/aprsd/rpc/client.py b/aprsd/rpc/client.py index 727f8d4..cd01f11 100644 --- a/aprsd/rpc/client.py +++ b/aprsd/rpc/client.py @@ -52,11 +52,9 @@ class RPCClient: LOG.debug(f"RPC Client: {self.ip}:{self.port} {self.magic_word}") def _rpyc_connect( - self, host, port, - service=rpyc.VoidService, + self, host, port, service=rpyc.VoidService, config={}, ipv6=False, - keepalive=False, authorizer=None, - ): + keepalive=False, authorizer=None, ): print(f"Connecting to RPC host {host}:{port}") try: @@ -71,7 +69,6 @@ class RPCClient: def get_rpc_client(self): if not self._rpc_client: - CONF.rpc_settings.magic_word self._rpc_client = self._rpyc_connect( self.ip, self.port,