From 83026a28974cdab8b386b818de99f60eecd707e2 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sat, 15 Sep 2007 19:18:58 +0000 Subject: Checkpoint svn path=/scripts/irbe-cli.py; revision=965 --- scripts/rpki/https.py | 1 + scripts/rpki/sql.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts/rpki') 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()) -- cgit v1.2.3