CLIENT-SERVER: improve socket connection
bzr revid: ced-11241ea0399272de36ac109cb6f40edf0668aa6a
This commit is contained in:
parent
009458b21f
commit
740ce14be3
|
@ -210,10 +210,8 @@ class GenericXMLRPCRequestHandler:
|
||||||
# print "TERP-RETURN :",r
|
# print "TERP-RETURN :",r
|
||||||
return r
|
return r
|
||||||
except Exception,e:
|
except Exception,e:
|
||||||
print "Exception in call:"
|
logger = Logger()
|
||||||
print '-'*60
|
logger.notifyChannel("web-services", LOG_ERROR, 'Exception in call: %s' % traceback.format_exc())
|
||||||
traceback.print_exc(file=sys.stdout)
|
|
||||||
print '-'*60
|
|
||||||
s=str(e)
|
s=str(e)
|
||||||
import tools
|
import tools
|
||||||
if tools.config['debug_mode']:
|
if tools.config['debug_mode']:
|
||||||
|
@ -302,10 +300,8 @@ class TinySocketClientThread(threading.Thread):
|
||||||
result = r
|
result = r
|
||||||
ts.mysend(result)
|
ts.mysend(result)
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
print "Exception in call:"
|
logger = Logger()
|
||||||
print '-'*60
|
logger.notifyChannel("web-services", LOG_ERROR, 'Exception in call: %s' % traceback.format_exc())
|
||||||
traceback.print_exc(file=sys.stdout)
|
|
||||||
print '-'*60
|
|
||||||
s=str(e)
|
s=str(e)
|
||||||
import tools
|
import tools
|
||||||
if tools.config['debug_mode']:
|
if tools.config['debug_mode']:
|
||||||
|
@ -317,7 +313,6 @@ class TinySocketClientThread(threading.Thread):
|
||||||
self.threads.remove(self)
|
self.threads.remove(self)
|
||||||
return True
|
return True
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
print "exception", e
|
|
||||||
self.sock.close()
|
self.sock.close()
|
||||||
return False
|
return False
|
||||||
def stop(self):
|
def stop(self):
|
||||||
|
@ -331,6 +326,7 @@ class TinySocketServerThread(threading.Thread):
|
||||||
self.__port=port
|
self.__port=port
|
||||||
self.__interface=interface
|
self.__interface=interface
|
||||||
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
|
self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||||
self.socket.bind((self.__interface, self.__port))
|
self.socket.bind((self.__interface, self.__port))
|
||||||
self.socket.listen(5)
|
self.socket.listen(5)
|
||||||
self.threads = []
|
self.threads = []
|
||||||
|
|
Loading…
Reference in New Issue