Morevna Changeset - 4f3ff4c311f2

Changeset - 4f3ff4c311f2

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Laman - 7 years ago 2018-01-24 10:58:18

bugfix: server failed to update its stored tree

2 files changed with 4 insertions and 3 deletions:

src/config.py

src/server.py

0 comments (0 inline, 0 general)

src/config.py

➞

Show inline comments

 import os
 import json
 import logging as log
 from logging.handlers import TimedRotatingFileHandler
 logger=log.getLogger()
 logger.setLevel(log.INFO)
 formatter=log.Formatter("%(asctime)s %(levelname)s: %(message)s",datefmt="%Y-%m-%d %H:%M:%S")
 handler=TimedRotatingFileHandler("/var/log/morevna/mor.log",when="midnight",backupCount=9)
 handler.setFormatter(formatter)
 logger.addHandler(handler)
 directory=os.path.join(os.path.dirname(__file__),"..")
 certfile=os.path.join(directory,"certs/cert.pem")
 keyfile=os.path.join(directory,"certs/key.pem")
 peers=os.path.join(directory,"certs/peers.pem")
 configFile=os.path.join(directory,"config.json")
 conf=dict()
 if os.path.isfile(configFile):
 	with open(configFile) as f: conf=json.load(f)
-version=[0,1,0]
+version=[0,1,1]
 lowestCompatible=[0,1,0] # tuple is more fitting but json conversion transforms it into a list anyway
 hosts=conf.get("hosts",["127.0.0.1"])
 port=conf.get("port",9901)
 batchSize=conf.get("batchSize",64)

src/server.py

➞

Show inline comments

@@ @@ -116,38 +116,39 @@ class Server(NetNode): @@
 		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))
 		jsonResponse={"command":"send", "index":index, "dataType":"data"}
 		if self._lastIndex+1!=index:
 			self._dataFile.seek(index*self.BLOCK_SIZE)
 		binResponse=self._dataFile.read(self.BLOCK_SIZE)
 		return (jsonResponse,binResponse)
 	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:]))
 		indices=jsonData["index"]
 		for (i,k) in enumerate(indices):
 			if self._lastIndex+1!=k:
 				self._dataFile.seek(k*self.BLOCK_SIZE)
 			self._dataFile.write(binData[i*self.BLOCK_SIZE:(i+1)*self.BLOCK_SIZE])
 			block=binData[i*self.BLOCK_SIZE:(i+1)*self.BLOCK_SIZE]
 			self._dataFile.write(block)
 			self._lastIndex=k
 			if self._treeFile:
-				self._newLeaves[k+self._tree.leafStart]=hashBlock(binData)
+				self._newLeaves[k+self._tree.leafStart]=hashBlock(block)
 		return ({"command": "ack", "index": indices},)
 	def _finalize(self):
 		log.info("closing session...")
 		self._dataFile.close()
 		self._dataFileHandle=None
 		if self._treeFile:
 			self._updateTree()
 		log.info("done")

0 comments (0 inline, 0 general)