fix api_status bug

Author: random-zebra

src/apiClient.py

@@ -6,17 +6,6 @@
 from misc import getCallerName, getFunctionName, printException, printDbg
 
 api_keys = ["b62b40b5091e", "f1d66708a077", "ed85c85c0126", "ccc60d06f737"]
-
-class DisconnectedException(Exception):
-    def __init__(self, message, apiClient):
-        # Call the base class constructor
-        super().__init__(message)
-        # clear client
-        try:
-            apiClient.client.close()
-            apiClient.client = requests.session()
-        except Exception:
-            pass
 
 
 def process_api_exceptions(func):
@@ -25,14 +14,11 @@ def process_api_exceptions_int(*args, **kwargs):
         apiClient = args[0]
         try:
             return func(*args, **kwargs)
-        
-        except DisconnectedException as e:
-            raise e
-            
+                   
         except Exception as e:
             message = "API Client exception"
             printException(getCallerName(True), getFunctionName(True), message, str(e))
-            raise DisconnectedException(message, apiClient)
+            return None
 
     return process_api_exceptions_int       
 
@@ -44,7 +30,6 @@ def __init__(self):
         self.url = "http://chainz.cryptoid.info/pivx/api.dws"
         self.parameters = {}
 
-        
 
     def checkResponse(self, parameters):
         key = choice(api_keys)
@@ -53,9 +38,7 @@ def checkResponse(self, parameters):
         if resp.status_code == 200:
             data = resp.json()
             return data
-        else:
-            raise DisconnectedException("Wrong Response", self)
-            return None    
+        return None
 
 
 
@@ -76,14 +59,16 @@ def getBalance(self, address):
         return self.checkResponse(self.parameters)
 
 
-        
-    @process_api_exceptions
     def getStatus(self):
         status_code = 0
         self.parameters = {}
         self.parameters['q'] = 'getblockcount'
-        resp = requests.get(self.url, self.parameters)
-        status_code = resp.status_code
+        try:
+            resp = requests.get(self.url, self.parameters)
+            status_code = resp.status_code
+        except Exception as e:
+            printException(getCallerName(True), getFunctionName(True), "API ERR", str(e))
+        
         return status_code
 
 

src/tabRewards.py

@@ -192,7 +192,7 @@ def load_utxos_thread(self, ctrl):
 
             api_status = self.caller.apiClient.getStatus()
             if  api_status != 200:
-                printDbg("Wrong response from API client. Status: %s" % status)
+                printDbg("Wrong response from API client. Status: %s" % api_status)
                 return
 
             self.apiConnected = True

src/version.txt

@@ -1,5 +1,5 @@
 {
  "number": "0.3.99",
- "tag": "l",
- "comments": ["Governance DB"]
+ "tag": "m",
+ "comments": ["api_status bug"]
  }

src/watchdogThreads.py

@@ -34,6 +34,7 @@ def run(self):
                 # first time we get connection reload UTXOs and Proposals
                 if not self.control_tab.t_rewards.utxoLoaded:
                     self.control_tab.t_rewards.load_utxos_thread(None)
+
                 if not self.control_tab.t_governance.proposalsLoaded:
                     self.control_tab.t_governance.loadProposals_thread(None)