Log up-down queries

svn path=/rpkid/rootd.py; revision=2728

2 files changed, 15 insertions, 0 deletions

diff --git a/rpkid/rootd.py b/rpkid/rootd.py
index 6479b70a..afe17ef7 100755
--- a/rpkid/rootd.py
+++ b/rpkid/rootd.py
@@ -183,6 +183,7 @@ class revoke_pdu(rpki.up_down.revoke_pdu):
     callback()
 
 class message_pdu(rpki.up_down.message_pdu):
+
   name2type = {
     "list"            : list_pdu,
     "list_response"   : rpki.up_down.list_response_pdu,
@@ -191,8 +192,15 @@ class message_pdu(rpki.up_down.message_pdu):
     "revoke"          : revoke_pdu,
     "revoke_response" : rpki.up_down.revoke_response_pdu,
     "error_response"  : rpki.up_down.error_response_pdu }
+
   type2name = dict((v, k) for k, v in name2type.items())
 
+  def log_query(self, child):
+    """
+    Log query we're handling.
+    """
+    rpki.log.info("Serving %s query" % self.type)
+
 class sax_handler(rpki.up_down.sax_handler):
   pdu = message_pdu
 
diff --git a/rpkid/rpki/up_down.py b/rpkid/rpki/up_down.py
index 2e088fb3..e5352e1a 100644
--- a/rpkid/rpki/up_down.py
+++ b/rpkid/rpki/up_down.py
@@ -631,12 +631,19 @@ class message_pdu(base_elt):
       callback(self.serve_error(e))
 
     try:
+      self.log_query(child)
       self.payload.serve_pdu(self, r_msg, child, done, lose)
     except (rpki.async.ExitNow, SystemExit):
       raise
     except Exception, edata:
       lose(edata)
 
+  def log_query(self, child):
+    """
+    Log query we're handling.  Separate method so rootd can override.
+    """
+    rpki.log.info("Serving %s query from child %s" % (self.type, child.child_handle))
+
   def serve_error(self, exception):
     """
     Generate an error_response message PDU.