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

Add some error handling

Browse source
This commit is contained in:
Arinerron 2018-04-18 19:16:10 -07:00
parent ded179bcad
commit 1332e9ee9e
No known key found for this signature in database
GPG key ID: 99383627861C62F0
2 changed files with 130 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

52
onionr/core.py
View file

@ -36,28 +36,32 @@ class Core:
'''
Initialize Core Onionr library
'''
self.queueDB = 'data/queue.db'
self.peerDB = 'data/peers.db'
self.blockDB = 'data/blocks.db'
self.blockDataLocation = 'data/blocks/'
self.addressDB = 'data/address.db'
self.hsAdder = ''
try:
self.queueDB = 'data/queue.db'
self.peerDB = 'data/peers.db'
self.blockDB = 'data/blocks.db'
self.blockDataLocation = 'data/blocks/'
self.addressDB = 'data/address.db'
self.hsAdder = ''
if not os.path.exists('data/'):
os.mkdir('data/')
if not os.path.exists('data/blocks/'):
os.mkdir('data/blocks/')
if not os.path.exists(self.blockDB):
self.createBlockDB()
if os.path.exists('data/hs/hostname'):
with open('data/hs/hostname', 'r') as hs:
self.hsAdder = hs.read()
self._utils = onionrutils.OnionrUtils(self)
# Initialize the crypto object
self._crypto = onionrcrypto.OnionrCrypto(self)
if not os.path.exists('data/'):
os.mkdir('data/')
if not os.path.exists('data/blocks/'):
os.mkdir('data/blocks/')
if not os.path.exists(self.blockDB):
self.createBlockDB()
if os.path.exists('data/hs/hostname'):
with open('data/hs/hostname', 'r') as hs:
self.hsAdder = hs.read()
self._utils = onionrutils.OnionrUtils(self)
# Initialize the crypto object
self._crypto = onionrcrypto.OnionrCrypto(self)
except Exception as error:
logger.error('Failed to initialize core Onionr library.', error=error)
logger.fatal('Cannot recover from error.')
exit(1)
return
def addPeer(self, peerID, name=''):
@ -125,7 +129,7 @@ class Core:
conn.close()
return True
else:
return False
return False
def createAddressDB(self):
'''
@ -357,7 +361,7 @@ class Core:
conn.close()
return
def listAdders(self, randomOrder=True, i2p=True):
'''
Return a list of addresses
@ -546,11 +550,11 @@ class Core:
self.setBlockType(addedHash, header)
retData = addedHash
return retData
def introduceNode(self):
'''
Introduces our node into the network by telling X many nodes our HS address
'''
nodeList = self.listAdders().split('\n')
self.daemonQueueAdd('announceNode', nodeList)
return
return