Morevna Changeset - 02ea4fed2520

Changeset - 02ea4fed2520

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Laman - 7 years ago 2017-10-31 21:47:51

fixes, error handling

5 files changed with 27 insertions and 12 deletions:

.hgignore

config.json

src/client.py

src/morevna.py

src/netnode.py

0 comments (0 inline, 0 general)

.hgignore

➞

Show inline comments

 /__pycache__/
 ^\..*
 ^certs/
 ^config.json
+^config.json$

config.json

➞

Show inline comments

+{
 	"hosts": ["127.0.0.1"],
-	"port": 9021,
+	"port": 9901,
 	"batchSize": 256
+}

src/client.py

➞

Show inline comments

 import sys
 import collections
 import socket
 import ssl
 import logging as log
 from datetime import datetime
 import config as conf
 import stats
 from util import Progress
 from hashtree import HashTree,hashBlock
 from netnode import BaseConnection,NetNode
+from netnode import BaseConnection,NetNode,FailedConnection
 class Connection(BaseConnection):
 	def __init__(self,host,port):
 		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((host,port))
 		except ConnectionRefusedError:
 			print("Couldn't connect to {0}:{1}".format(conf.hosts[0],conf.port))
 			sys.exit(1)
 		except ConnectionRefusedError as e:
 			log.exception(e)
 			print("Couldn't connect to {0}:{1}".format(host,port))
 			raise FailedConnection()
 		except ssl.SSLError as e:
 			log.exception(e)
 			print("Error creating SSL connection to {0}:{1}".format(host,port))
 			raise FailedConnection()
 		self.createNetworkers()
 		print("Connected to {0}".format(host))
 class Client(NetNode):
 	def __init__(self,filename,treeFile=""):
 		print(datetime.now(), "initializing...")
 		super().__init__(filename,treeFile)

src/morevna.py

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ import logging as log @@
 from argparse import ArgumentParser
 from util import spawnDaemon, splitHost
 import config as conf
 import stats
 from hashtree import HashTree
 from client import Client, Connection as ClientConnection
+from client import Client, Connection as ClientConnection, FailedConnection
 from server import Miniserver
 def _checkFile(f):
 	if not os.path.isfile(f):
 		print("invalid file specified:",f,file=sys.stderr)
@@ @@ -34,34 +34,40 @@ def push(args): @@
 	if args.tree:
 		_checkFile(args.tree)
 	if args.host: conf.hosts=[args.host]
 	if args.port: conf.port=args.port
 	c=Client(args.datafile,args.tree)
 	for host in conf.hosts:
 		with ClientConnection(*splitHost(host,conf.port)) as con:
 	for h in conf.hosts:
 		host=splitHost(h,conf.port)
 		try:
 			with ClientConnection(*host) as con:
 			c.setConnection(con)
 			blocksToTransfer=c.negotiate()
 			c.sendData(blocksToTransfer)
 		print()
 		print(stats.report())
 		except FailedConnection: continue
 def pull(args):
 	_checkFile(args.datafile)
 	if args.tree:
 		_checkFile(args.tree)
 	if args.host: conf.hosts=[args.host]
 	if args.port: conf.port=args.port
 	c=Client(args.datafile,args.tree)
 	with ClientConnection(*splitHost(conf.hosts[0],conf.port)) as con:
 	host=splitHost(conf.hosts[0],conf.port)
 	try:
 		with ClientConnection(*host) as con:
 		c.setConnection(con)
 		blocksToTransfer=c.negotiate()
 		c.pullData(blocksToTransfer)
 	print()
 	print(stats.report())
 	except FailedConnection: pass
 def serve(args):
 	_checkFile(args.datafile)
 	if args.tree:
 		_checkFile(args.tree)
 	if args.host: conf.hosts.insert(0,args.host)
@@ @@ -89,13 +95,13 @@ 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")
 pUpdate.add_argument("-p","--port",type=int)
-pUpdate.add_argument("--host",default="127.0.0.1")
 pUpdate.add_argument("--host")
 pUpdate.add_argument("-t","--tree",help="stored hash tree location")
 pUpdate.add_argument("datafile")
 pUpdate.set_defaults(func=pull)
 pServe=subparsers.add_parser("serve")
 pServe.add_argument("-p","--port",type=int)

src/netnode.py

➞

Show inline comments

@@ @@ -2,12 +2,15 @@ import socket @@
 import logging as log
 from networkers import NetworkReader,NetworkWriter
 from hashtree import HashTree
 class FailedConnection(Exception): pass
 class BaseConnection: # abstract
 	def __init__(self):
 		self._socket=None
 		self.incoming=None
 		self.outcoming=None

0 comments (0 inline, 0 general)