Changeset 2879

Timestamp:

05/09/07 14:53:20 (13 years ago)

Author:

pjkersha

Message:

ows_server/ows_server/controllers/logout.py:

• tidy up error handling with separate redirect method
• don't catch errors on redirect_to - HTTP 302 exception is expected.

File:

• TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/logout.py (modified) (4 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/logout.py

@@ -66 +66 @@
             # There's no handle to a security session
             log.error("logout called but no 'ndgSec' key in session object")
-            return render_response('content')
+            return self.__redirect()
         
         # Look into the session and go kill the wallet
@@ -85 +85 @@
         except Exception, e:
             log.error("logout - creating Session Manager client: %s" % e)
-               
+            return self.__redirect()  
+        
         # Disconnect from Session Manager
         log.info("Calling Session Manager disconnect for logout")
@@ -92 +93 @@
         except Exception, e:
             log.error("Error with Session Manager logout: %s" % e)
-
+            self.__redirect()
+            
         try:
             # easy to kill our cookie
@@ -101 +103 @@
         except Exception, e:   
             log.error("logout - clearing security session: %s" % e)
-            
-        try:
+
+        return self.__redirect()
+    
+    
+    def __redirect(self):
+        """Handle redirect back to previous page"""
+        if c.returnTo:
+            # Decode the return to address
             try:
-                if c.returnTo:
-                    # Decode the return to address
-                    b64decReturnTo = base64.urlsafe_b64decode(c.returnTo)
-                   
-                    # and now go back to whence we had come
-                    h.redirect_to(b64decReturnTo)
+                b64decReturnTo = base64.urlsafe_b64decode(c.returnTo)
             except Exception, e:
                 log.error("logout - decoding return URL: %s" % e) 
-        finally:
+                return render_response('content')
+            
+            # and now go back to whence we had come
+            h.redirect_to(b64decReturnTo)
+        else:
             return render_response('content')