fixing logs

p2p/kademlia/protocol.py

@@ -11,8 +11,6 @@ from kademlia.utils import digest
 log = logging.getLogger(__name__)  # pylint: disable=invalid-name
 
 
-
-
 #### PROXY PROTOCOL
 class ProxyDatagramProtocol(asyncio.DatagramProtocol):
 
@@ -62,12 +60,12 @@ log = logging.getLogger(__name__)  # pylint: disable=invalid-name
 
 
 class KademliaProtocol(RPCProtocol):
-    def __init__(self, source_node, storage, ksize, log=print):
+    def __init__(self, source_node, storage, ksize, log=None):
         RPCProtocol.__init__(self)
         self.router = RoutingTable(self, ksize, source_node)
         self.storage = storage
         self.source_node = source_node
-        self.log=print
+        self.log=log.debug if log is None else log
 
     def get_refresh_ids(self):
         """
@@ -90,8 +88,8 @@ class KademliaProtocol(RPCProtocol):
     def rpc_store(self, sender, nodeid, key, value):
         source = Node(nodeid, sender[0], sender[1])
         self.welcome_if_new(source)
-        self.log("got a store request from %s, storing '%s' -> %s (binary keys)'" %
-                  (sender, key.hex(), len(value)))
+        self.log("got a store request from %s, storing '%s' -> %s'" %
+                  (sender, key.hex(), value))
         self.storage[key] = value
         return True
 
@@ -172,7 +170,7 @@ class KademliaProtocol(RPCProtocol):
         we get no response, make sure it's removed from the routing table.
         """
         if not result[0]:
-            log.warning("no response from %s, removing from router", node)
+            self.log("!! no response from %s, removing from router", node)
             self.router.remove_contact(node)
             return result
 

p2p/p2p.py

@@ -10,17 +10,26 @@ NODES_PRIME = [("128.232.229.63",8467), ("68.66.241.111",8467)]
 def logger():
     import logging
     handler = logging.StreamHandler()
-    formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+    formatter = logging.Formatter('[%(asctime)s]\n%(message)s\n')
     handler.setFormatter(formatter)
     logger = logging.getLogger(__file__)
     logger.addHandler(handler)
     logger.setLevel(logging.DEBUG)
     return logger
 
+LOG = None
+
+def log(*x):
+    global LOG
+    if not LOG: LOG=logger().debug
+
+    tolog=' '.join(str(_) for _ in x)
+    LOG(tolog)
+
 def boot_lonely_selfless_node(port=8467):
     async def go():
         from api import Api,PORT_LISTEN
-        API = Api()
+        API = Api(log=log)
         await API.connect_forever(8467)
     asyncio.run(go())