From 50fde51396515747c8ca8225eab2e268a82ae840 Mon Sep 17 00:00:00 2001
From: murraymack <murraymack@gmail.com>
Date: Mon, 25 Oct 2021 10:59:11 -0600
Subject: [PATCH] merge from origin master. update result_handler

---
 miners/bosminer.py |  2 +-
 miners/cgminer.py  | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/miners/bosminer.py b/miners/bosminer.py
index 7eb21c3a..a5435da0 100644
--- a/miners/bosminer.py
+++ b/miners/bosminer.py
@@ -133,4 +133,4 @@ class BOSminer(BaseMiner):
             if chain['Chips'] == 0:
                 bad += 1
         if not bad > 0:
-            return str(self.ip)
+            return str(self.ip)
\ No newline at end of file
diff --git a/miners/cgminer.py b/miners/cgminer.py
index 42fdfc6f..04968f9a 100644
--- a/miners/cgminer.py
+++ b/miners/cgminer.py
@@ -38,15 +38,6 @@ class CGMiner(BaseMiner):
                     continue
         # handle result
         self._result_handler(result)
-        if result is not None:
-            if result.stdout != "":
-                print(result.stdout)
-                if result.stderr != "":
-                    print("ERROR: " + result.stderr)
-            elif result.stderr != "":
-                print("ERROR: " + result.stderr)
-            else:
-                print(cmd)
 
     @staticmethod
     def _result_handler(result: asyncssh.process.SSHCompletedProcess) -> None:
@@ -57,6 +48,16 @@ class CGMiner(BaseMiner):
                 print("ssh stderr: \n" + result.stderrr)
             if len(result.stdout) <= 0 and len(result.stderr) <= 0:
                 print("ssh stdout stderr empty")
+            else:
+                print(cmd)
+            # if result.stdout != "":
+            #     print(result.stdout)
+            #     if result.stderr != "":
+            #         print("ERROR: " + result.stderr)
+            # elif result.stderr != "":
+            #     print("ERROR: " + result.stderr)
+            # else:
+            #     print(cmd)
 
     async def restart_cgminer(self) -> None:
         commands = ['cgminer-api restart',
@@ -91,4 +92,4 @@ class CGMiner(BaseMiner):
             result = await conn.run(command, check=True)
             self._result_handler(result)
             self.config = result.stdout
-            print(str(self.config))
+            print(str(self.config))
\ No newline at end of file