Add logging

.gitignore

@@ -14,7 +14,8 @@ build
 eggs
 parts
 bin
-var
+var/*
+!.placeholder
 sdist
 develop-eggs
 .installed.cfg

social_relay/config.py

@@ -1,4 +1,7 @@
 # No need to change this normally, override in locals if needed
+import logging
+import os
+
 RELAY_USERNAME = "relay"
 
 # Just something hcard needs, override in locals if you want to customize
@@ -15,6 +18,14 @@
 
 POD_LIST_JSON = "http://the-federation.info/pods.json"
 
+LOG_PATH = "var/social-relay.log"
+
+logging.basicConfig(
+    filename=os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", LOG_PATH),
+    level=logging.DEBUG,
+    format='%(asctime)s:%(levelname)s:%(module)s: %(message)s'
+)
+
 from social_relay.local_config import *
 
 # Make sure we have a GUID

tasks/fetch_pod_list.py

@@ -1,3 +1,4 @@
+import logging
 from redis import Redis
 import requests
 import schedule
@@ -9,7 +10,7 @@
 
 
 def fetch_pod_lists():
-    print("Fetching pod list")
+    logging.info("Fetching pod list")
     response = requests.get(config.POD_LIST_JSON)
     data = response.json()
     # TODO: also remove inactives from list

tasks/poll_pods.py

@@ -1,4 +1,5 @@
 from _socket import timeout
+import logging
 from redis import Redis
 import requests
 from requests.exceptions import ConnectionError, Timeout
@@ -12,7 +13,7 @@
 
 def get_pod_relay_preferences(host):
     """Query remote pods on https first, fall back to http."""
-    print("Querying %s" % host)
+    logging.info("Querying %s" % host)
     try:
         try:
             response = requests.get("https://%s/.well-known/x-social-relay" % host, timeout=5)
@@ -31,14 +32,16 @@ def get_pod_relay_preferences(host):
 
 
 def poll_pods():
-    print("Polling pods")
+    logging.info("Polling pods")
     pods = r.hgetall("pods")
     for pod, data in pods.items():
         data = get_pod_relay_preferences(pod.decode("utf-8"))
         if data:
+            logging.debug("Pod: %s, preferences: %s" % (pod.decode("utf-8"), data))
             r.hset("pod_preferences", pod, data)
         else:
             if r.hexists("pod_preferences", pod):
+                logging.debug("Pod %s preferences not found, deleting cached data" % pod.decode("utf-8"))
                 r.hdel("pod_preferences", pod)
 
 

workers/receive.py

@@ -1,5 +1,6 @@
 from _socket import timeout
 import json
+import logging
 from federation.controllers import handle_receive
 from federation.entities.base import Post
 from federation.exceptions import NoSuitableProtocolFoundError
@@ -32,7 +33,7 @@ def send_payload(host, payload):
     Return True or False, depending on success of operation.
     Timeouts or connection errors will not be raised.
     """
-    print("Sending payload to %s" % host)
+    logging.info("Sending payload to %s" % host)
     try:
         try:
             response = requests.post("https://%s/receive/public" % host, data=payload, timeout=10)
@@ -51,15 +52,19 @@ def process(payload):
     """Open payload and route it to any pods that might be interested in it."""
     try:
         sender, protocol_name, entities = handle_receive(payload, skip_author_verification=True)
+        logging.debug("sender=%s, protocol_name=%s, entities=%s" % (sender, protocol_name, entities))
     except NoSuitableProtocolFoundError:
+        logging.warning("No suitable protocol found for payload")
         return
     if protocol_name != "diaspora":
+        logging.warning("Unsupported protocol: %s, sender: %s" % (protocol_name, sender))
         return
     if not entities:
+        logging.warning("No entities in payload")
         return
     send_to_pods = pods_who_want_all()
     for entity in entities:
-        print(entity)
+        logging.info("Entity: %s" % entity)
         # We only care about posts atm
         if isinstance(entity, Post):
             # Send out