MySQLdb.connection.ping() doesn't accept keyword arguments

svn path=/rpkid/irdbd.py; revision=1850

3 files changed, 6 insertions, 1 deletions

diff --git a/rpkid/irdbd.py b/rpkid/irdbd.py
index d4eb83b4..a2dccaa4 100755
--- a/rpkid/irdbd.py
+++ b/rpkid/irdbd.py
@@ -30,7 +30,7 @@ import rpki.exceptions, rpki.left_right, rpki.log, rpki.x509
 def handler(query, path):
   try:
 
-    db.ping(reconnect = True)
+    db.ping(True)
 
     q_msg = rpki.left_right.cms_msg.unwrap(query, (bpki_ta, rpkid_cert))
 
diff --git a/rpkid/pubd.py b/rpkid/pubd.py
index 18311d26..81d15524 100755
--- a/rpkid/pubd.py
+++ b/rpkid/pubd.py
@@ -62,6 +62,7 @@ class pubd_context(rpki.rpki_engine.rpkid_context):
     """Process one PDU from the IRBE."""
     rpki.log.trace()
     try:
+      self.db.ping(True)
       return 200, self.handler_common(query, None, (self.bpki_ta, self.irbe_cert))
     except Exception, data:
       rpki.log.error(traceback.format_exc())
@@ -71,6 +72,7 @@ class pubd_context(rpki.rpki_engine.rpkid_context):
     """Process one PDU from a client."""
     rpki.log.trace()
     try:
+      self.db.ping(True)
       client_id = path.partition("/client/")[2]
       if not client_id.isdigit():
         raise rpki.exceptions.BadContactURL, "Bad path: %s" % path
diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py
index 53130720..18c17c48 100644
--- a/rpkid/rpki/rpki_engine.py
+++ b/rpkid/rpki/rpki_engine.py
@@ -103,6 +103,7 @@ class rpkid_context(object):
     """Process one left-right PDU."""
     rpki.log.trace()
     try:
+      self.db.ping(True)
       q_msg = rpki.left_right.cms_msg.unwrap(query, (self.bpki_ta, self.irbe_cert))
       if q_msg.type != "query":
         raise rpki.exceptions.BadQuery, "Message type is not query"
@@ -118,6 +119,7 @@ class rpkid_context(object):
     """Process one up-down PDU."""
     rpki.log.trace()
     try:
+      self.db.ping(True)
       child_id = path.partition("/up-down/")[2]
       if not child_id.isdigit():
         raise rpki.exceptions.BadContactURL, "Bad path: %s" % path
@@ -138,6 +140,7 @@ class rpkid_context(object):
 
     rpki.log.trace()
     try:
+      self.db.ping(True)
       for s in rpki.left_right.self_elt.sql_fetch_all(self):
         s.client_poll()
         s.update_children()