fixed the case of missing tickets and a typo in last commit

2012-08-28 22:14:59 -05:00
parent 415104345d
commit 4ef0e6cc94
5 changed files with 26 additions and 16 deletions
@@ -90,7 +90,7 @@ from dal import BaseAdapter
 from settings import global_settings
 from validators import CRYPT
 from cache import Cache
-from html import URL as Url, xmlescape
+from html import URL, xmlescape
 from utils import is_valid_ip_address
 from rewrite import load, url_in, thread as rwthread, try_rewrite_on_error
 import newcron
@@ -442,10 +442,10 @@ def wsgibase(environ, responder):
                if not exists(request.folder):
                    if app == rwthread.routes.default_application \
                            and app != 'welcome':
-                        redirect(Url(app,'default','index'))
+                        redirect(URL('welcome','default','index'))
                    elif rwthread.routes.error_handler:
                        _handler = rwthread.routes.error_handler
-                        redirect(Url(_handler['application'],
+                        redirect(URL(_handler['application'],
                                     _handler['controller'],
                                     _handler['function'],
                                     args=app))
@@ -456,7 +456,7 @@ def wsgibase(environ, responder):
                elif not request.is_local and \
                        exists(pjoin(request.folder,'DISABLED')):
                    raise HTTP(503, "<html><body><h1>Temporarily down for maintenance</h1></body></html>")
-                request.url = Url(r=request,
+                request.url = URL(r=request,
                                  args=request.args,
                                  extension=request.raw_extension)

@@ -88,16 +88,19 @@ class TicketStorage(Storage):
        ticket_id,
        ):
        if not self.db:
-            ef = self._error_file(request, ticket_id, 'rb', app)
+            try:
+                ef = self._error_file(request, ticket_id, 'rb', app)
+            except IOError:
+                return {}
            try:
                return cPickle.load(ef)
            finally:
                ef.close()
-        table = self._get_table(self.db, self.tablename, app)
-        rows = self.db(table.ticket_id == ticket_id).select()
-        if rows:
-            return cPickle.loads(rows[0].ticket_data)
-        return None
+        else:
+            table = self._get_table(self.db, self.tablename, app)
+            rows = self.db(table.ticket_id == ticket_id).select()
+            return cPickle.loads(rows[0].ticket_data) if rows else {}
+            


 class RestrictedError(Exception):
@@ -164,10 +167,10 @@ class RestrictedError(Exception):
        ticket_storage = TicketStorage(db=request.tickets_db)
        d = ticket_storage.load(request, app, ticket_id)

-        self.layer = d['layer']
-        self.code = d['code']
-        self.output = d['output']
-        self.traceback = d['traceback']
+        self.layer = d.get('layer')
+        self.code = d.get('code')
+        self.output = d.get('output')
+        self.traceback = d.get('traceback')
        self.snapshot = d.get('snapshot')

    def __str__(self):