Merge pull request #339 from Ratio1/develop

update for dAuth and r1fs timeouts and logging

Author: cristibleotiu

extensions/business/dauth/dauth_mixin.py

@@ -191,8 +191,6 @@ def get_comms_host_pair(self):
     raw_comms_seed = self.os_environ.get(seed_key, "")
     comms_seed = raw_comms_seed.split(" ")
 
-    if self.cfg_dauth_log_response:
-      self.P(f"Comms seed for {seed_key}: {comms_seed} | Raw: '{raw_comms_seed}'")
 
     if not comms_seed:
       return_value = self.os_environ.get(key, None)
@@ -201,15 +199,19 @@ def get_comms_host_pair(self):
       # round-robin selection
       self.mqtt_seed_index = (self.mqtt_seed_index + 1) % len(comms_seed)
       return_value = comms_seed[self.mqtt_seed_index]
+      if self.cfg_dauth_log_response:
+        self.P(f"Comms seed for {seed_key}: {comms_seed} | Raw: '{raw_comms_seed}'. Selected '{return_value}' ({self.mqtt_seed_index})")
     # end if
     return key, return_value
 
 
-  def fill_dauth_data(self,
-                      dauth_data,
-                      requester_node_address,
-                      is_node=False,
-                      sender_eth_address=None):
+  def fill_dauth_data(
+    self,
+    dauth_data,
+    requester_node_address,
+    is_node=False,
+    sender_eth_address=None
+  ):
     """
     Fill the data with the authentication data.
     """

extensions/business/r1fs/r1fs_manager_api.py

@@ -13,6 +13,8 @@
 
   'R1FS_VERBOSE' : 11,
 
+  'REQUEST_TIMEOUT' : None, # in seconds, None means no timeout
+  
   'VALIDATION_RULES': {
     **BasePlugin.CONFIG['VALIDATION_RULES'],
   },

ver.py

@@ -1 +1 @@
-__VER__ = '2.9.980'
+__VER__ = '2.9.990'