X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fserver.py;h=2d8e13b2683e8b590f8fa97881907a021e9253d0;hb=b1775bb47ea5e242d337dbd34f5d58d10a57a028;hp=93c3e81430b75d24e86bb5cbcf11807e2eef2eab;hpb=d8495e7978db21cafcda6cc3a67e564762aeaecd;p=sfa.git diff --git a/sfa/util/server.py b/sfa/util/server.py index 93c3e814..2d8e13b2 100644 --- a/sfa/util/server.py +++ b/sfa/util/server.py @@ -19,13 +19,12 @@ import SimpleHTTPServer import SimpleXMLRPCServer from OpenSSL import SSL from Queue import Queue + from sfa.trust.certificate import Keypair, Certificate from sfa.trust.credential import * from sfa.util.faults import * from sfa.plc.api import SfaAPI from sfa.util.cache import Cache -from sfa.util.debug import log -from sfa.util.sfalogging import logger ## # Verification callback for pyOpenSSL. We do our own checking of keys because # we have our own authentication spec. Thus we disable several of the normal @@ -110,7 +109,7 @@ class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): except Exception, fault: # This should only happen if the module is buggy # internal error, report as HTTP server error - traceback.print_exc() + sfa_error.log_exc("server.do_POST") response = self.api.prepare_response(fault) #self.send_response(500) #self.end_headers()