X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfaserver.py;h=223ae774cb2edfb1fe84897a6e4d7eb97624b6c6;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=f392b785fde1bf4ca3199e71c7735e7536a1545d;hpb=ee8a376da1107884bee1ea29248a70e4da8410c9;p=sfa.git diff --git a/sfa/server/sfaserver.py b/sfa/server/sfaserver.py index f392b785..223ae774 100644 --- a/sfa/server/sfaserver.py +++ b/sfa/server/sfaserver.py @@ -20,6 +20,7 @@ from sfa.trust.certificate import Keypair, Certificate # the credential, and verify that the user is using the key that matches the # GID supplied in the credential. + class SfaServer(threading.Thread): ## @@ -28,19 +29,20 @@ class SfaServer(threading.Thread): # @param ip the ip address to listen on # @param port the port to listen on # @param key_file private key filename of registry - # @param cert_file certificate filename containing public key + # @param cert_file certificate filename containing public key # (could be a GID file) - def __init__(self, ip, port, key_file, cert_file,interface): + def __init__(self, ip, port, key_file, cert_file, interface): threading.Thread.__init__(self) - self.key = Keypair(filename = key_file) - self.cert = Certificate(filename = cert_file) + self.key = Keypair(filename=key_file) + self.cert = Certificate(filename=cert_file) #self.server = SecureXMLRPCServer((ip, port), SecureXMLRpcRequestHandler, key_file, cert_file) - self.server = ThreadedServer((ip, port), SecureXMLRpcRequestHandler, key_file, cert_file) - self.server.interface=interface + self.server = ThreadedServer( + (ip, int(port)), SecureXMLRpcRequestHandler, key_file, cert_file) + self.server.interface = interface self.trusted_cert_list = None self.register_functions() - logger.info("Starting SfaServer, interface=%s"%interface) + logger.info("Starting SfaServer, interface=%s" % interface) ## # Register functions that will be served by the XMLRPC server. This @@ -57,9 +59,7 @@ class SfaServer(threading.Thread): return anything ## - # Execute the server, serving requests forever. + # Execute the server, serving requests forever. def run(self): self.server.serve_forever() - -