syndicate-lang
/
hop-2012
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better error ignoring; logging

This commit is contained in:
Tony Garnock-Jones 2012-06-01 11:26:06 +01:00
parent 03a8d91ed8
commit 740ef15cbf
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
experiments/python/hop/relay.py
View File

@ -15,6 +15,9 @@
## You should have received a copy of the GNU General Public License ## You should have received a copy of the GNU General Public License
## along with Hop. If not, see <http://www.gnu.org/licenses/>. ## along with Hop. If not, see <http://www.gnu.org/licenses/>.
from __future__ import with_statement
import logging
import threading import threading
import socket import socket
@ -24,21 +27,25 @@ from dispatch import HopRelayMixin
class HopRelay(HopRelayMixin): class HopRelay(HopRelayMixin):
def __init__(self, in_ch, out_ch, ns = None, peer_address = None): def __init__(self, in_ch, out_ch, ns = None, peer_address = None):
self.lock = threading.Lock()
self.in_ch = in_ch self.in_ch = in_ch
self.out_ch = out_ch self.out_ch = out_ch
self.peer_address = peer_address self.peer_address = peer_address
self.thread = threading.Thread(target = self.relay_main) self.thread = threading.Thread(target = self.relay_main)
self.namespace = ns if ns else namespace.default_namespace self.namespace = ns if ns else namespace.default_namespace
self.lock = threading.Lock()
self.thread.start() self.thread.start()
def write(self, x): def write(self, x):
try: if self.out_ch:
self.lock.acquire() with self.lock:
sexp.write_sexp(self.out_ch, x) try:
self.out_ch.flush() sexp.write_sexp(self.out_ch, x)
finally: self.out_ch.flush()
self.lock.release() except Exception:
## Don't care, here - we assume that any write
## error will be reflected in the socket closing
## in a little while in any case.
pass
def error(self, message, details): def error(self, message, details):
self.write(['error', message, details]) self.write(['error', message, details])
@ -69,19 +76,25 @@ class HopRelay(HopRelayMixin):
except EOFError: except EOFError:
pass pass
finally: finally:
self.in_ch.close() o = self.out_ch
self.out_ch.close() i = self.in_ch
self.out_ch = None
self.in_ch = None
i.close()
o.close()
class TcpRelayServer: class TcpRelayServer:
def __init__(self, host = '0.0.0.0', port = 5671): def __init__(self, host = '0.0.0.0', port = 5671):
self.listen_address = (host, port)
self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self.server_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
self.server_socket.bind((host, port)) self.server_socket.bind(self.listen_address)
self.server_socket.listen(4) self.server_socket.listen(4)
self.thread = threading.Thread(target = self.listen_main) self.thread = threading.Thread(target = self.listen_main)
self.thread.start() self.thread.start()
def listen_main(self): def listen_main(self):
logging.info("Accepting connections on %r" % (self.listen_address,))
while True: while True:
conn, addr = self.server_socket.accept() conn, addr = self.server_socket.accept()
conn.send(sexp.format(['hop'])) conn.send(sexp.format(['hop']))