dxs
/
onionr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

logging is less spammy, file disabled by default, and we dont try to scan encrypted blocks that aren't for us

master
Kevin Froman 2018-09-26 20:37:52 -05:00
parent 8dbaac2198
commit b5fecdf1e8
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onionr/api.py
View File

@ -515,7 +515,7 @@ class API:
while len(self._core.hsAddress) == 0:
self._core.refreshFirstStartVars()
time.sleep(0.5)
self.http_server = WSGIServer((self.host, bindPort), app)
self.http_server = WSGIServer((self.host, bindPort), app, log=None)
self.http_server.serve_forever()
except KeyboardInterrupt:
pass

23
onionr/onionrutils.py
View File

@ -263,18 +263,21 @@ class OnionrUtils:
myBlock = Block(blockHash, self._core)
if myBlock.isEncrypted:
myBlock.decrypt()
blockType = myBlock.getMetadata('type') # we would use myBlock.getType() here, but it is bugged with encrypted blocks
signer = self.bytesToStr(myBlock.signer)
valid = myBlock.verifySig()
try:
if len(blockType) <= 10:
self._core.updateBlockInfo(blockHash, 'dataType', blockType)
if myBlock.decrypted:
blockType = myBlock.getMetadata('type') # we would use myBlock.getType() here, but it is bugged with encrypted blocks
signer = self.bytesToStr(myBlock.signer)
valid = myBlock.verifySig()
try:
if len(blockType) <= 10:
self._core.updateBlockInfo(blockHash, 'dataType', blockType)
onionrevents.event('processblocks', data = {'block': myBlock, 'type': blockType, 'signer': signer, 'validSig': valid}, onionr = None)
onionrevents.event('processblocks', data = {'block': myBlock, 'type': blockType, 'signer': signer, 'validSig': valid}, onionr = None)
except TypeError:
logger.warn("Missing block information")
pass
except TypeError:
logger.warn("Missing block information")
pass
else:
logger.debug('Not processing metadata on encrypted block we cannot decrypt.')
def escapeAnsi(self, line):
'''

2
onionr/static-data/default_config.json
View File

@ -30,7 +30,7 @@
"log": {
"file": {
"output": true,
"output": false,
"path": "data/output.log"
},