CLIENT/SERVER: improve tiny_socket for exception and remove some bad print
bzr revid: ced-5911d9548ae7c671f8c41718d1ca4459fb9c1f52
This commit is contained in:
parent
bfff615b9b
commit
82eeab710a
|
@ -198,16 +198,13 @@ class GenericXMLRPCRequestHandler:
|
||||||
import traceback
|
import traceback
|
||||||
try:
|
try:
|
||||||
n=self.path.split("/")[-1]
|
n=self.path.split("/")[-1]
|
||||||
# print "TERP-CALLING:",n,method,params
|
|
||||||
s=LocalService(n)
|
s=LocalService(n)
|
||||||
m=getattr(s,method)
|
m=getattr(s,method)
|
||||||
s._service._response=None
|
s._service._response=None
|
||||||
r=m(*params)
|
r=m(*params)
|
||||||
res=s._service._response
|
res=s._service._response
|
||||||
if res!=None:
|
if res!=None:
|
||||||
# print "RESPONSE FOUND"
|
|
||||||
r=res
|
r=res
|
||||||
# print "TERP-RETURN :",r
|
|
||||||
return r
|
return r
|
||||||
except Exception,e:
|
except Exception,e:
|
||||||
logger = Logger()
|
logger = Logger()
|
||||||
|
@ -262,13 +259,10 @@ class HttpDaemon(threading.Thread):
|
||||||
else:
|
else:
|
||||||
self.server.socket.shutdown(2)
|
self.server.socket.shutdown(2)
|
||||||
self.server.socket.close()
|
self.server.socket.close()
|
||||||
# self.server.socket.close()
|
|
||||||
# del self.server
|
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
self.server.register_introspection_functions()
|
self.server.register_introspection_functions()
|
||||||
|
|
||||||
# self.server.serve_forever()
|
|
||||||
self.running = True
|
self.running = True
|
||||||
while self.running:
|
while self.running:
|
||||||
self.server.handle_request()
|
self.server.handle_request()
|
||||||
|
@ -307,8 +301,7 @@ class TinySocketClientThread(threading.Thread):
|
||||||
res=s._service._response
|
res=s._service._response
|
||||||
if res!=None:
|
if res!=None:
|
||||||
r=res
|
r=res
|
||||||
result = r
|
ts.mysend(r)
|
||||||
ts.mysend(result)
|
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
logger = Logger()
|
logger = Logger()
|
||||||
logger.notifyChannel("web-services", LOG_ERROR, 'Exception in call: ' + reduce(lambda x, y: x+y, traceback.format_exc()))
|
logger.notifyChannel("web-services", LOG_ERROR, 'Exception in call: ' + reduce(lambda x, y: x+y, traceback.format_exc()))
|
||||||
|
@ -327,8 +320,6 @@ class TinySocketClientThread(threading.Thread):
|
||||||
return False
|
return False
|
||||||
def stop(self):
|
def stop(self):
|
||||||
self.running = False
|
self.running = False
|
||||||
# self.sock.shutdown(socket.SHUT_RDWR)
|
|
||||||
# self.sock.close()
|
|
||||||
|
|
||||||
class TinySocketServerThread(threading.Thread):
|
class TinySocketServerThread(threading.Thread):
|
||||||
def __init__(self, interface, port, secure=False):
|
def __init__(self, interface, port, secure=False):
|
||||||
|
@ -346,14 +337,10 @@ class TinySocketServerThread(threading.Thread):
|
||||||
try:
|
try:
|
||||||
self.running = True
|
self.running = True
|
||||||
while self.running:
|
while self.running:
|
||||||
#accept connections from outside
|
|
||||||
(clientsocket, address) = self.socket.accept()
|
(clientsocket, address) = self.socket.accept()
|
||||||
#now do something with the clientsocket
|
|
||||||
#in this case, we'll pretend this is a threaded server
|
|
||||||
ct = TinySocketClientThread(clientsocket, self.threads)
|
ct = TinySocketClientThread(clientsocket, self.threads)
|
||||||
ct.start()
|
ct.start()
|
||||||
self.threads.append(ct)
|
self.threads.append(ct)
|
||||||
# print "threads size:", len(self.threads)
|
|
||||||
self.socket.close()
|
self.socket.close()
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
self.socket.close()
|
self.socket.close()
|
||||||
|
|
|
@ -2,6 +2,11 @@ import socket
|
||||||
import cPickle
|
import cPickle
|
||||||
import marshal
|
import marshal
|
||||||
|
|
||||||
|
class Myexception(Exception):
|
||||||
|
def __init__(self, faultCode, faultString):
|
||||||
|
self.faultCode = faultCode
|
||||||
|
self.faultString = faultString
|
||||||
|
|
||||||
class mysocket:
|
class mysocket:
|
||||||
def __init__(self, sock=None):
|
def __init__(self, sock=None):
|
||||||
if sock is None:
|
if sock is None:
|
||||||
|
@ -10,8 +15,11 @@ class mysocket:
|
||||||
else:
|
else:
|
||||||
self.sock = sock
|
self.sock = sock
|
||||||
self.sock.settimeout(60)
|
self.sock.settimeout(60)
|
||||||
def connect(self, host, port):
|
def connect(self, host, port=False):
|
||||||
self.sock.connect((host, port))
|
if not port:
|
||||||
|
protocol, buf = host.split('//')
|
||||||
|
host, port = buf.split(':')
|
||||||
|
self.sock.connect((host, int(port)))
|
||||||
def disconnect(self):
|
def disconnect(self):
|
||||||
self.sock.shutdown(socket.SHUT_RDWR)
|
self.sock.shutdown(socket.SHUT_RDWR)
|
||||||
self.sock.close()
|
self.sock.close()
|
||||||
|
@ -19,6 +27,7 @@ class mysocket:
|
||||||
msg = cPickle.dumps(msg)
|
msg = cPickle.dumps(msg)
|
||||||
size = len(msg)
|
size = len(msg)
|
||||||
self.sock.send('%8d' % size)
|
self.sock.send('%8d' % size)
|
||||||
|
self.sock.send(exception and "1" or "0")
|
||||||
totalsent = 0
|
totalsent = 0
|
||||||
while totalsent < size:
|
while totalsent < size:
|
||||||
sent = self.sock.send(msg[totalsent:])
|
sent = self.sock.send(msg[totalsent:])
|
||||||
|
@ -33,6 +42,11 @@ class mysocket:
|
||||||
raise RuntimeError, "socket connection broken"
|
raise RuntimeError, "socket connection broken"
|
||||||
buf += chunk
|
buf += chunk
|
||||||
size = int(buf)
|
size = int(buf)
|
||||||
|
buf = self.sock.recv(1)
|
||||||
|
if buf != "0":
|
||||||
|
exception = buf
|
||||||
|
else:
|
||||||
|
exception = False
|
||||||
msg = ''
|
msg = ''
|
||||||
while len(msg) < size:
|
while len(msg) < size:
|
||||||
chunk = self.sock.recv(size-len(msg))
|
chunk = self.sock.recv(size-len(msg))
|
||||||
|
@ -41,6 +55,8 @@ class mysocket:
|
||||||
msg = msg + chunk
|
msg = msg + chunk
|
||||||
res = cPickle.loads(msg)
|
res = cPickle.loads(msg)
|
||||||
if isinstance(res,Exception):
|
if isinstance(res,Exception):
|
||||||
|
if exception:
|
||||||
|
raise Myexception(exception, str(res))
|
||||||
raise res
|
raise res
|
||||||
else:
|
else:
|
||||||
return res
|
return res
|
||||||
|
|
Loading…
Reference in New Issue