From 5a7dcc7fcf181fdc96bd7199b1312d3b9602c80c Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Thu, 24 Feb 2022 14:42:34 -0700 Subject: [PATCH] fixed some bugs in getting ssh connections --- miners/bmminer.py | 7 ++++++- miners/bosminer.py | 8 ++++++-- miners/btminer.py | 2 -- miners/cgminer.py | 6 +++++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/miners/bmminer.py b/miners/bmminer.py index 7f2d1c46..8bb6af66 100644 --- a/miners/bmminer.py +++ b/miners/bmminer.py @@ -52,10 +52,15 @@ class BMMiner(BaseMiner): server_host_key_algs=['ssh-rsa']) return conn except Exception as e: - print(e) + print("Exception raised:", self.ip) + raise e except OSError: print(str(self.ip) + ": Connection refused.") return None + except Exception as e: + print("Exception raised:", self.ip) + raise e + async def send_ssh_command(self, cmd): result = None diff --git a/miners/bosminer.py b/miners/bosminer.py index c216fb30..8b524b53 100644 --- a/miners/bosminer.py +++ b/miners/bosminer.py @@ -20,8 +20,12 @@ class BOSMiner(BaseMiner): async def _get_ssh_connection(self) -> asyncssh.connect: """Create a new asyncssh connection""" - conn = await asyncssh.connect(str(self.ip), known_hosts=None, username=self.uname, password=self.pwd, - server_host_key_algs=['ssh-rsa']) + try: + conn = await asyncssh.connect(str(self.ip), known_hosts=None, username=self.uname, password=self.pwd, + server_host_key_algs=['ssh-rsa']) + except Exception as e: + print("Exception raised:", self.ip) + raise e # return created connection return conn diff --git a/miners/btminer.py b/miners/btminer.py index 988486fc..d0b17d04 100644 --- a/miners/btminer.py +++ b/miners/btminer.py @@ -30,7 +30,6 @@ class BTMiner(BaseMiner): except APIError: return "?" - async def get_board_info(self) -> dict: """Gets data on each board and chain in the miner.""" devs = await self.api.devs() @@ -56,4 +55,3 @@ class BTMiner(BaseMiner): else: print(board) return boards - diff --git a/miners/cgminer.py b/miners/cgminer.py index d83c458d..e5f382bf 100644 --- a/miners/cgminer.py +++ b/miners/cgminer.py @@ -56,10 +56,14 @@ class CGMiner(BaseMiner): server_host_key_algs=['ssh-rsa']) return conn except Exception as e: - print(e) + print("Exception raised:", self.ip) + raise e except OSError: print(str(self.ip) + " Connection refused.") return None + except Exception as e: + print("Exception raised:", self.ip) + raise e async def send_ssh_command(self, cmd): result = None