From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Tue, 14 Jul 2009 15:18:39 +0000 (+0000)
Subject: capture server errors and return propper error to user.
X-Git-Tag: sfa-0.9-0@14641~56
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0b0c71dc0392940e2a4e0ed69b62d17b398d89b4;p=sfa.git

capture server errors and return propper error to user.
---

diff --git a/sfa/util/geniserver.py b/sfa/util/geniserver.py
index ed82f01d..2980b2ed 100644
--- a/sfa/util/geniserver.py
+++ b/sfa/util/geniserver.py
@@ -141,11 +141,11 @@ class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
 
         It was copied out from SimpleXMLRPCServer.py and modified to shutdown the socket cleanly.
         """
-        self.api = GeniAPI(peer_cert = self.server.peer_cert, 
+        try:
+            self.api = GeniAPI(peer_cert = self.server.peer_cert, 
                            interface = self.server.interface, 
                            key_file = self.server.key_file, 
                            cert_file = self.server.cert_file)
-        try:
             # get arguments
             request = self.rfile.read(int(self.headers["content-length"]))
             # In previous versions of SimpleXMLRPCServer, _dispatch