X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fcomponentserver.py;h=85969778e004d862f28b3bb18a19a033544a79bd;hb=00018e8f437f02c99e438f17c57aafc038052171;hp=542b4be0033421a56d8e14a14bce158efb862663;hpb=d92ae5f7e0543b026911ddf1351fe9c3abb5fc02;p=sfa.git diff --git a/sfa/util/componentserver.py b/sfa/util/componentserver.py index 542b4be0..85969778 100644 --- a/sfa/util/componentserver.py +++ b/sfa/util/componentserver.py @@ -6,9 +6,6 @@ # TODO: investigate ways to combine this with existing PLC server? ## -### $Id$ -### $URL$ - import sys import traceback import threading @@ -18,12 +15,13 @@ import BaseHTTPServer import SimpleHTTPServer import SimpleXMLRPCServer from OpenSSL import SSL + +from sfa.util.sfalogging import logger from sfa.trust.certificate import Keypair, Certificate from sfa.trust.credential import * from sfa.util.faults import * from sfa.plc.api import ComponentAPI -from sfa.util.server import verify_callback, ThreadedServer -from sfa.util.debug import log +from sfa.server.sfaserver import verify_callback, ThreadedServer ## @@ -73,7 +71,7 @@ class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): # internal error, report as HTTP server error self.send_response(500) self.end_headers() - traceback.print_exc() + logger.log_exc("componentserver.SecureXMLRpcRequestHandler.do_POST") else: # got a valid XML RPC response self.send_response(200)