Morevna Changeset - 095908159393

Changeset - 095908159393

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Laman - 8 years ago 2017-10-28 12:26:02

handled connection error, skipped needless tree rebuild

3 files changed with 16 insertions and 3 deletions:

src/client.py

src/morevna.py

src/netnode.py

0 comments (0 inline, 0 general)

src/client.py

➞

Show inline comments

@@ @@ -16,25 +16,25 @@ class Connection(BaseConnection): @@
 	def __init__(self):
 		super().__init__()
 		sock=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		sslContext=ssl.create_default_context(cafile=conf.peers)
 		sslContext.check_hostname=False
 		sslContext.load_cert_chain(conf.certfile,conf.keyfile)
 		self._socket=sslContext.wrap_socket(sock)
 		try:
 			self._socket.connect((conf.hosts[0], conf.port))
 		except ConnectionRefusedError:
 			print("Couldn't connect to {0}".format(conf.hosts[0]))
+			print("Couldn't connect to {0}:{1}".format(conf.hosts[0],conf.port))
 			sys.exit(1)
 		self.createNetworkers()
 class Client(NetNode):
 	def __init__(self,filename,treeFile=""):
 		print(datetime.now(), "initializing...")
 		super().__init__(filename,treeFile)
 	## Asks server for node hashes to determine which are to be transferred.
+	#
@@ @@ -72,24 +72,27 @@ class Client(NetNode): @@
 				(j1,j2)=[HashTree.HASH_LEN*ji for ji in (j,j+1)]
 				if localTree.store[i]!=binData[j1:j2]:
 					# ie. 0-6 nodes, 7-14 leaves. 2*6+2<15
 					if 2*i+2<len(localTree.store): # inner node
 						frontier.append(2*i+1)
 						frontier.append(2*i+2)
 					else:
 						blocksToTransfer.append(i-localTree.leafStart) # leaf
 						progress.p(i-localTree.leafStart)
 			nodeStack.extend(reversed(frontier))
 		progress.done()
 		size=stats.formatBytes(len(blocksToTransfer)*self._tree.BLOCK_SIZE)
 		print(datetime.now(), "{0} to transfer".format(size))
 		return blocksToTransfer
 	def sendData(self,blocksToTransfer):
 		log.info(blocksToTransfer)
 		dataFile=open(self._filename, mode="rb")
 		i1=-1
 		print(datetime.now(), "sending data:")
 		progress=Progress(len(blocksToTransfer))
 		for (k,i2) in enumerate(blocksToTransfer):
 			jsonData={"command":"send", "index":i2, "dataType":"data"}
 			if i1+1!=i2:

src/morevna.py

➞

Show inline comments

@@ @@ -10,24 +10,30 @@ from hashtree import HashTree @@
 from client import Client, Connection as ClientConnection
 from server import Miniserver
 def _checkFile(f):
 	if not os.path.isfile(f):
 		print("invalid file specified:",f,file=sys.stderr)
 		sys.exit(1)
 def buildTree(args):
 	_checkFile(args.datafile)
 	if os.path.isfile(args.treefile):
 		treeMod=os.stat(args.treefile).st_mtime
 		dataMod=os.stat(args.datafile).st_mtime
 		if dataMod<treeMod and not args.force:
 			print("tree file is up to date")
 			return
 	tree=HashTree.fromFile(args.datafile)
 	tree.save(args.treefile)
 def push(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
 	c=Client(args.datafile,args.tree)
@@ @@ -62,24 +68,25 @@ def serve(args): @@
 	s=Miniserver(args.datafile,args.tree)
 	try:
 		spawnDaemon(s.serve)
 	except Exception as e:
 		log.exception("exception: %s",e)
 parser=ArgumentParser()
 subparsers=parser.add_subparsers()
 pBuild=subparsers.add_parser("build")
 pBuild.add_argument("-f","--force",action="store_true",help="force tree rebuild")
 pBuild.add_argument("treefile", help="stored hash tree location")
 pBuild.add_argument("datafile")
 pBuild.set_defaults(func=buildTree)
 pUpdate=subparsers.add_parser("push")
 pUpdate.add_argument("-p","--port",type=int)
 pUpdate.add_argument("--host")
 pUpdate.add_argument("-t","--tree",help="stored hash tree location")
 pUpdate.add_argument("datafile")
 pUpdate.set_defaults(func=push)
 pUpdate=subparsers.add_parser("pull")

src/netnode.py

➞

Show inline comments

@@ @@ -13,26 +13,29 @@ class BaseConnection: # abstract @@
 	def createNetworkers(self):
 		fr=self._socket.makefile(mode="rb")
 		fw=self._socket.makefile(mode="wb")
 		self.incoming=NetworkReader(fr)
 		self.outcoming=NetworkWriter(fw)
 	def __enter__(self):
 		return self.incoming,self.outcoming
 	def __exit__(self, exc_type, exc_val, exc_tb):
 		self._socket.shutdown(socket.SHUT_RDWR)
 		self._socket.close()
 		try:
 			self._socket.shutdown(socket.SHUT_RDWR)
 			self._socket.close()
 		except OSError:
 			log.warning("encountered an error when shutting down the connection")
 class NetNode:
 	def __init__(self,filename,treeFile=""):
 		self._incoming=None
 		self._outcoming=None
 		self._filename=filename
 		self._treeFile=treeFile
 		if treeFile:
 			self._tree=HashTree.load(treeFile)

0 comments (0 inline, 0 general)