Checkpoint

svn path=/scripts/irbe-cli.py; revision=965

4 files changed, 20 insertions, 16 deletions

diff --git a/scripts/irbe-cli.py b/scripts/irbe-cli.py
index 6355e799..6d01cc3c 100755
--- a/scripts/irbe-cli.py
+++ b/scripts/irbe-cli.py
@@ -126,9 +126,8 @@ def usage():
 def main():
   """Main program.
 
-  This is still a work in progress.  At the moment it gets as
-  transmitting the generated request, but doesn't yet do anything with
-  responses.
+  Work in progress.  At the moment it gets as far as transmitting the
+  generated request, but doesn't yet do anything with responses.
   """
 
   cfg = rpki.config.parser("irbe.conf")
@@ -167,6 +166,7 @@ def main():
     print q_xml
     sys.exit(1)
 
+  print "Sending:"
   print q_xml
 
   q_cms = rpki.cms.encode(q_xml, cfg.get(section, "cms-key"), cfg.multiget(section, "cms-cert"))
@@ -176,8 +176,6 @@ def main():
 
   r_xml = rpki.cms.decode(r_cms, cfg.get(section, "cms-ta"))
 
-  print r_xml
-
   r_elt = lxml.etree.fromstring(r_xml)
   try:
     rng.assertValid(r_elt)
@@ -186,11 +184,13 @@ def main():
     print r_xml
     sys.exit(1)
 
-  handler = rpki.left_right.sax_handler()
-  lxml.sax.saxify(r_elt, handler)
-  r_msg = handler.result
+  print "Received:"
+  print r_xml
 
-  # Do something useful with reply here
-  print r_msg
+  if False:
+    handler = rpki.left_right.sax_handler()
+    lxml.sax.saxify(r_elt, handler)
+    r_msg = handler.result
+    # Do something useful with reply here
 
 if __name__ == "__main__": main()
diff --git a/scripts/rpki/https.py b/scripts/rpki/https.py
index 3abd5bb6..7d628490 100644
--- a/scripts/rpki/https.py
+++ b/scripts/rpki/https.py
@@ -55,6 +55,7 @@ class requestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
       try:
         rcode, rtext = handler(query=query_string, path=self.path)
       except Exception, edata:
+        raise
         rcode, rtext = 500, "Unhandled exception %s" % edata
     self.send_response(rcode)
     self.send_header("Content-Type", rpki_content_type)
diff --git a/scripts/rpki/sql.py b/scripts/rpki/sql.py
index 3bee2ff8..04f51661 100644
--- a/scripts/rpki/sql.py
+++ b/scripts/rpki/sql.py
@@ -111,7 +111,7 @@ class sql_persistant(object):
       self.in_sql = True
       self.sql_decode(sql_parent, *row)
       if self.sql_id_name is not None:
-        self.cache_add()
+        self.sql_cache_add()
       self_dict = self.sql_encode()
       self.sql_fetch_hook(db, cur)
       result.append(self)
@@ -128,7 +128,7 @@ class sql_persistant(object):
       cur.execute(self.sql_insert_cmd, self.sql_encode())
       if self.sql_id_name is not None:
         setattr(self, self.sql_id_name, cur.lastrowid)
-        self.cache_add()
+        self.sql_cache_add()
       self.sql_insert_hook(db, cur)
     elif self.sql_dirty:
       cur.execute(self.sql_update_cmd, self.sql_encode())
diff --git a/scripts/rpkid.py b/scripts/rpkid.py
index 9398575b..be3c8bec 100755
--- a/scripts/rpkid.py
+++ b/scripts/rpkid.py
@@ -18,24 +18,26 @@ def encode(msg, cms_key, cms_certs):
 
 def left_right_handler(query, path):
 
-  def fetch_maybe():
+  def fetch_maybe(q_pdu):
     if rpki.left_right.self_elt.sql_cache_find(q_pdu.self_id) is None:
       rpki.left_right.self_elt.sql_fetch(db, cur, { "self_id" : q_pdu.self_id })
 
-  def make_reply(r_pdu = q_pdu.__class__()):
+  def make_reply(q_pdu, r_pdu=None):
+    if r_pdu is None:
+      r_pdu = q_pdu.__class__()
     r_pdu.action = q_pdu.action
     r_pdu.type = "reply"
     return r_pdu
 
   def destroy_handler(q_pdu):
-    r_pdu = make_reply()
+    r_pdu = make_reply(q_pdu)
     r_pdu.self_id = q_pdu.self_id
     setattr(r_pdu, q_pdu.sql_id_name, getattr(q_pdu, q_pdu.sql_id_name))
     q_pdu.sql_delete()    
     r_msg.append(r_pdu)
 
   def create_handler(q_pdu):
-    r_pdu = make_reply()
+    r_pdu = make_reply(q_pdu)
     q_pdu.sql_store(db, cur)
     r_pdu.self_id = q_pdu.self_id
     setattr(r_pdu, q_pdu.sql_id_name, getattr(q_pdu, q_pdu.sql_id_name))
@@ -71,6 +73,7 @@ def left_right_handler(query, path):
   except Exception, data:
     if show_traceback:
       traceback.print_exc()
+    raise
     return 500, "Unhandled exception %s" % data
 
 def up_down_handler(query, path):