CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add logging to base miner API

Browse Source
This commit is contained in:
UpstreamData
2022-03-16 10:56:33 -06:00
parent eb8cefa461
commit 57bd606f21
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
API/__init__.py
View File

@@ -2,6 +2,7 @@ import asyncio
import json import json
import ipaddress import ipaddress
import warnings import warnings
import logging
class APIError(Exception): class APIError(Exception):
@@ -55,6 +56,7 @@ class BaseMinerAPI:
async def multicommand(self, *commands: str) -> dict: async def multicommand(self, *commands: str) -> dict:
"""Creates and sends multiple commands as one command to the miner.""" """Creates and sends multiple commands as one command to the miner."""
logging.debug(f"{self.ip}: Sending multicommand: {[*commands]}")
# split the commands into a proper list # split the commands into a proper list
user_commands = [*commands] user_commands = [*commands]
allowed_commands = self.get_commands() allowed_commands = self.get_commands()
@@ -70,7 +72,7 @@ If you are sure you want to use this command please use API.send_command("{item}
data = None data = None
try: try:
data = await self.send_command(command) data = await self.send_command(command)
except APIError: except APIError as e:
try: try:
data = {} data = {}
# S19 handler, try again # S19 handler, try again
@@ -80,8 +82,9 @@ If you are sure you want to use this command please use API.send_command("{item}
except APIError as e: except APIError as e:
raise APIError(e) raise APIError(e)
except Exception as e: except Exception as e:
print(e) logging.warning(f"{self.ip}: API Multicommand Error: {e}")
if data: if data:
logging.debug(f"{self.ip}: Received multicommand data.")
return data return data
async def send_command(self, command: str, parameters: str or int or bool = None, ignore_errors: bool = False) -> dict: async def send_command(self, command: str, parameters: str or int or bool = None, ignore_errors: bool = False) -> dict:
@@ -115,7 +118,7 @@ If you are sure you want to use this command please use API.send_command("{item}
break break
data += d data += d
except Exception as e: except Exception as e:
print(e) logging.warning(f"{self.ip}: API Command Error: {e}")
data = self.load_api_data(data) data = self.load_api_data(data)
@@ -128,6 +131,7 @@ If you are sure you want to use this command please use API.send_command("{item}
# validate the command succeeded # validate the command succeeded
validation = self.validate_command_output(data) validation = self.validate_command_output(data)
if not validation[0]: if not validation[0]:
logging.warning(f"{self.ip}: API Command Error: {validation[1]}")
raise APIError(validation[1]) raise APIError(validation[1])
return data return data
@@ -160,6 +164,7 @@ If you are sure you want to use this command please use API.send_command("{item}
@staticmethod @staticmethod
def load_api_data(data: bytes) -> dict: def load_api_data(data: bytes) -> dict:
"""Convert API data from JSON to dict""" """Convert API data from JSON to dict"""
str_data = None
try: try:
# some json from the API returns with a null byte (\x00) on the end # some json from the API returns with a null byte (\x00) on the end
if data.endswith(b"\x00"): if data.endswith(b"\x00"):
@@ -180,6 +185,5 @@ If you are sure you want to use this command please use API.send_command("{item}
parsed_data = json.loads(str_data) parsed_data = json.loads(str_data)
# handle bad json # handle bad json
except json.decoder.JSONDecodeError as e: except json.decoder.JSONDecodeError as e:
print(e)
raise APIError(f"Decode Error: {str_data}") raise APIError(f"Decode Error: {str_data}")
return parsed_data return parsed_data