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
python3 - 2to3 + miscell obvious tweaks
[sfa.git]
/
sfa
/
server
/
threadedserver.py
diff --git
a/sfa/server/threadedserver.py
b/sfa/server/threadedserver.py
index
5d07e69
..
d5c47bf
100644
(file)
--- a/
sfa/server/threadedserver.py
+++ b/
sfa/server/threadedserver.py
@@
-10,10
+10,10
@@
import sys
import socket
import traceback
import threading
import socket
import traceback
import threading
-from
Q
ueue import Queue
-import
SocketS
erver
-import
BaseHTTPS
erver
-import
SimpleXMLRPCS
erver
+from
q
ueue import Queue
+import
sockets
erver
+import
http.s
erver
+import
xmlrpc.s
erver
from OpenSSL import SSL
from sfa.util.sfalogging import logger
from OpenSSL import SSL
from sfa.util.sfalogging import logger
@@
-86,7
+86,7
@@
def verify_callback(conn, x509, err, depth, preverify):
# handler
# handler
-class SecureXMLRpcRequestHandler(
SimpleXMLRPCS
erver.SimpleXMLRPCRequestHandler):
+class SecureXMLRpcRequestHandler(
xmlrpc.s
erver.SimpleXMLRPCRequestHandler):
"""Secure XML-RPC request handler class.
It it very similar to SimpleXMLRPCRequestHandler but it uses HTTPS for transporting XML data.
"""Secure XML-RPC request handler class.
It it very similar to SimpleXMLRPCRequestHandler but it uses HTTPS for transporting XML data.
@@
-151,7
+151,7
@@
class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
# Taken from the web (XXX find reference). Implements an HTTPS xmlrpc server
# Taken from the web (XXX find reference). Implements an HTTPS xmlrpc server
-class SecureXMLRPCServer(
BaseHTTPServer.HTTPServer, SimpleXMLRPCS
erver.SimpleXMLRPCDispatcher):
+class SecureXMLRPCServer(
http.server.HTTPServer, xmlrpc.s
erver.SimpleXMLRPCDispatcher):
def __init__(self, server_address, HandlerClass, key_file, cert_file, logRequests=True):
"""
def __init__(self, server_address, HandlerClass, key_file, cert_file, logRequests=True):
"""
@@
-170,11
+170,11
@@
class SecureXMLRPCServer(BaseHTTPServer.HTTPServer, SimpleXMLRPCServer.SimpleXML
HandlerClass.cache = Cache()
# for compatibility with python 2.4 (centos53)
if sys.version_info < (2, 5):
HandlerClass.cache = Cache()
# for compatibility with python 2.4 (centos53)
if sys.version_info < (2, 5):
-
SimpleXMLRPCS
erver.SimpleXMLRPCDispatcher.__init__(self)
+
xmlrpc.s
erver.SimpleXMLRPCDispatcher.__init__(self)
else:
else:
-
SimpleXMLRPCS
erver.SimpleXMLRPCDispatcher.__init__(
+
xmlrpc.s
erver.SimpleXMLRPCDispatcher.__init__(
self, True, None)
self, True, None)
-
SocketS
erver.BaseServer.__init__(self, server_address, HandlerClass)
+
sockets
erver.BaseServer.__init__(self, server_address, HandlerClass)
ctx = SSL.Context(SSL.SSLv23_METHOD)
ctx.use_privatekey_file(key_file)
ctx.use_certificate_file(cert_file)
ctx = SSL.Context(SSL.SSLv23_METHOD)
ctx.use_privatekey_file(key_file)
ctx.use_certificate_file(cert_file)
@@
-202,7
+202,7
@@
class SecureXMLRPCServer(BaseHTTPServer.HTTPServer, SimpleXMLRPCServer.SimpleXML
def _dispatch(self, method, params):
logger.debug("SecureXMLRPCServer._dispatch, method=%s" % method)
try:
def _dispatch(self, method, params):
logger.debug("SecureXMLRPCServer._dispatch, method=%s" % method)
try:
- return
SimpleXMLRPCS
erver.SimpleXMLRPCDispatcher._dispatch(self, method, params)
+ return
xmlrpc.s
erver.SimpleXMLRPCDispatcher._dispatch(self, method, params)
except:
# can't use format_exc() as it is not available in jython yet
# (even in trunk).
except:
# can't use format_exc() as it is not available in jython yet
# (even in trunk).
@@
-244,7
+244,7
@@
class SecureXMLRPCServer(BaseHTTPServer.HTTPServer, SimpleXMLRPCServer.SimpleXML
# for each request, requests are processed by of pool of reusable threads.
# for each request, requests are processed by of pool of reusable threads.
-class ThreadPoolMixIn(
SocketS
erver.ThreadingMixIn):
+class ThreadPoolMixIn(
sockets
erver.ThreadingMixIn):
"""
use a thread pool instead of a new thread on every request
"""
"""
use a thread pool instead of a new thread on every request
"""
@@
-277,7
+277,7
@@
class ThreadPoolMixIn(SocketServer.ThreadingMixIn):
obtain request from queue instead of directly from server socket
"""
while True:
obtain request from queue instead of directly from server socket
"""
while True:
-
SocketS
erver.ThreadingMixIn.process_request_thread(
+
sockets
erver.ThreadingMixIn.process_request_thread(
self, *self.requests.get())
def handle_request(self):
self, *self.requests.get())
def handle_request(self):