git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert Rspecs and SliceTags to data structure with Node objects connected by Link...
[sfa.git]
/
sfa
/
util
/
geniserver.py
diff --git
a/sfa/util/geniserver.py
b/sfa/util/geniserver.py
index
1a7307d
..
2980b2e
100644
(file)
--- a/
sfa/util/geniserver.py
+++ b/
sfa/util/geniserver.py
@@
-25,7
+25,7
@@
from sfa.trust.certificate import Keypair, Certificate
from sfa.trust.credential import *
from sfa.util.faults import *
from sfa.trust.credential import *
from sfa.util.faults import *
-from sfa.
util
.api import GeniAPI
+from sfa.
plc
.api import GeniAPI
from sfa.util.debug import log
##
from sfa.util.debug import log
##
@@
-141,8
+141,11
@@
class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
It was copied out from SimpleXMLRPCServer.py and modified to shutdown the socket cleanly.
"""
It was copied out from SimpleXMLRPCServer.py and modified to shutdown the socket cleanly.
"""
- 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:
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)
# get arguments
request = self.rfile.read(int(self.headers["content-length"]))
# In previous versions of SimpleXMLRPCServer, _dispatch
# get arguments
request = self.rfile.read(int(self.headers["content-length"]))
# In previous versions of SimpleXMLRPCServer, _dispatch