Morevna Changeset - e3c116b7dc5c

Changeset - e3c116b7dc5c

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Laman - 7 years ago 2018-03-03 12:40:20

bugfix: really recover from a failed ssl connection

2 files changed with 9 insertions and 6 deletions:

src/morevna.py

src/server.py

0 comments (0 inline, 0 general)

src/morevna.py

➞

Show inline comments

@@ @@ -81,17 +81,18 @@ def serve(args): @@
 	_checkFile(args.datafile)
 	if args.tree:
 		_checkFile(args.tree)
 	if args.host: conf.hosts.insert(0,args.host)
 	if args.port: conf.port=args.port
 	s=Miniserver(args.datafile,args.tree)
 	try:
 		s=Miniserver(args.datafile,args.tree)
 		spawnDaemon(s.serve)
 	except Exception as e:
 		log.exception("exception: %s",e)
 		print("Failed to start:\n  ",e)
 parser=ArgumentParser()
 subparsers=parser.add_subparsers()
 pBuild=subparsers.add_parser("build")

src/server.py

➞

Show inline comments

@@ @@ -12,15 +12,17 @@ from datafile import DataFile @@
 class Connection(BaseConnection):
 	def __init__(self,serverSocket,sslContext):
 		super().__init__()
 		sock, address = serverSocket.accept()
 		try: self._socket=sslContext.wrap_socket(sock,server_side=True)
 		peer=sock.getpeername()
 		try:
 			self._socket=sslContext.wrap_socket(sock,server_side=True)
 		except ssl.SSLError as e:
-			log.warning("Failed to establish an SSL connection from {0}.".format(sock.getpeername()))
+			log.warning("Failed to establish an SSL connection from {0}.".format(peer))
 			raise e
 		log.info('Connected by {0}'.format(address))
 		self.createNetworkers()
@@ @@ -111,34 +113,34 @@ class Server(NetNode): @@
 		else:
 			assert False, jsonData["command"]
 		return True
 	def _requestHash(self,indices):
-		log.info("received request for nodes #{0}".format(",".join(str(i) for i in indices)))
 		log.info("received request for nodes {0}".format(indices))
 		assert all(i<len(self._tree.store) for i in indices)
 		hashes=[self._tree.store[i] for i in indices]
 		jsonResponse={"command":"send", "index":indices, "dataType":"hash"}
 		binResponse=b"".join(hashes)
 		return (jsonResponse,binResponse)
 	def _requestData(self,index):
-		log.info("received request for data block #{0}".format(index))
+		log.info("received request for data blocks {0}".format(index))
 		jsonResponse={"command":"send", "index":index, "dataType":"data"}
 		blocks=[]
 		for i in index:
 			blocks.append(self._dataFile.readFrom(i))
 		return (jsonResponse,b"".join(blocks))
 	def _receiveData(self,jsonData,binData):
 		if not self.isLocked(): self._lock()
-		log.info("received data block #{0}: {1}...{2}".format(jsonData["index"],binData[:5],binData[-5:]))
+		log.info("received data blocks {0}: {1}...{2}".format(jsonData["index"],binData[:5],binData[-5:]))
 		indices=jsonData["index"]
 		for (i,k) in enumerate(indices):
 			block=binData[i*self.BLOCK_SIZE:(i+1)*self.BLOCK_SIZE]
 			self._dataFile.writeAt(k,block)
 			if self._treeFile:

0 comments (0 inline, 0 general)