More debugging for reg tests and getstr command

modules/chankeep.py

@@ -16,7 +16,7 @@ def getEnabledRelays(net):
     :return: list of enabled relay numbers
     """
     enabledRelays = [x for x in main.network[net].relays.keys() if main.network[net].relays[x]["enabled"]]
-    debug(f"getEnabledRelays() {net}: {enabledRelays}")
+    # debug(f"getEnabledRelays() {net}: {enabledRelays}")
     return enabledRelays
 
 
@@ -34,7 +34,7 @@ def getConnectedRelays(net):
         if name in main.IRCPool.keys():
             if main.IRCPool[name].isconnected:
                 connectedRelays.append(i)
-    debug(f"getConnectedRelays() {net}: {connectedRelays}")
+    # debug(f"getConnectedRelays() {net}: {connectedRelays}")
     return connectedRelays
 
 
@@ -50,15 +50,15 @@ def getActiveRelays(net):
     for i in enabledRelays:
         name = net + str(i)
         if name in main.IRCPool.keys():
-            debug(
-                (
-                    f"getActiveRelays() {net}: {i} auth:{main.IRCPool[name].authenticated} "
-                    f"conn:{main.IRCPool[name].isconnected}"
-                )
-            )
+            # debug(
+            #     (
+            #         f"getActiveRelays() {net}: {i} auth:{main.IRCPool[name].authenticated} "
+            #         f"conn:{main.IRCPool[name].isconnected}"
+            #     )
+            # )
             if main.IRCPool[name].authenticated and main.IRCPool[name].isconnected:
                 activeRelays.append(i)
-    debug(f"getActiveRelays() {net}: {activeRelays}")
+    # debug(f"getActiveRelays() {net}: {activeRelays}")
     return activeRelays
 
 
@@ -84,7 +84,7 @@ def allRelaysActive(net):
     activeRelays = getActiveRelays(net)
     enabledRelays = getEnabledRelays(net)
     relaysActive = len(activeRelays) == len(enabledRelays)
-    debug(f"allRelaysActive() {net}: {relaysActive} ({activeRelays}/{enabledRelays})")
+    # debug(f"allRelaysActive() {net}: {relaysActive} ({activeRelays}/{enabledRelays})")
     return relaysActive
 
 

modules/helpers.py

@@ -12,16 +12,16 @@ def get_first_relay(net):
     """
     cur_relay = 0
     max_relay = len(main.network[net].relays.keys()) + 1
-    debug(f"get_first_relay() {net}: max_relay:{max_relay}")
+    # debug(f"get_first_relay() {net}: max_relay:{max_relay}")
     activeRelays = chankeep.getActiveRelays(net)
-    debug(f"get_first_relay() {net}: activeRelays:{activeRelays}")
+    # debug(f"get_first_relay() {net}: activeRelays:{activeRelays}")
     while cur_relay != max_relay:
         cur_relay += 1
         if cur_relay not in activeRelays:
             continue
         name = net + str(cur_relay)
         if name in main.IRCPool.keys():
-            debug(f"get_first_relay() {net}: found relay {name}")
+            # debug(f"get_first_relay() {net}: found relay {name}")
             return main.IRCPool[name]
     return None
 

modules/regproc.py

@@ -146,6 +146,8 @@ def get_unregistered_relays(net=None):
 def registerTest(c):
     sinst = substitute(c["net"], c["num"])
     name = c["net"] + str(c["num"])
+    net = c["net"]
+    num = c["num"]
     if sinst["check"] is False:
         return
     if "msg" in c.keys() and not c["msg"] is None:
@@ -157,24 +159,28 @@ def registerTest(c):
                             confirmRegistration(
                                 c["net"], c["num"], negativepass=False
                             )  # Not passed negative check, report back
+                            debug(f"registerTest() {net} - {num} not passed negative:checknegativemsg check, {sinst['checknegativemsg']} present in message")
                             return
                         if sinst["checkendnegative"] in c["msg"]:
                             confirmRegistration(
                                 c["net"], c["num"], negativepass=True
                             )  # Passed the negative check, report back
+                            debug(f"registerTest() {net} - {num} passed negative:checkendnegative check, {sinst['checkendnegative']} present in message")
                             return
         if sinst["ping"]:
             if sinst["checkmsg2"] in c["msg"] and c["nick"] == sinst["entity"]:
                 confirmRegistration(c["net"], c["num"])
+                debug(f"registerTest() {net} - {num} passed ping:checkmsg2 check, {sinst['checkmsg2']} present in message")
                 return
-    if sinst["checktype"] == "msg":
-        if "msg" in c.keys():
+        if sinst["checktype"] == "msg":
             if sinst["checkmsg"] in c["msg"]:
                 confirmRegistration(c["net"], c["num"])
+                debug(f"registerTest() {net} - {num} passed checktype:msg:checkmsg check, {sinst['checkmsg']} present in message")
                 return
     elif sinst["checktype"] == "mode":
         if c["type"] == "self":
             if c["mtype"] == "mode":
                 if sinst["checkmode"] in c["mode"] and c["status"] is True:
                     confirmRegistration(c["net"], c["num"])
+                    debug(f"registerTest() {net} - {num} passed checktype:mode:checkmost check, {sinst['checkmode']} present in mode")
                     return