progress in removing core

This commit is contained in:
Kevin Froman 2019-07-24 11:32:23 -05:00
parent a74f2c5051
commit 274505a51f
10 changed files with 28 additions and 30 deletions

View file

@ -39,12 +39,11 @@ class OnionrCommunicatorDaemon:
def __init__(self, onionrInst, proxyPort, developmentMode=config.get('general.dev_mode', False)):
onionrInst.communicatorInst = self
# configure logger and stuff
onionr.Onionr.setupConfig('data/', self = self)
onionr.Onionr.setupConfig(onionrInst)
self.onionrInst = onionrInst
self.config = config
self.storage_counter = storagecounter.StorageCounter()
self.proxyPort = proxyPort
self.hsAddress = gettransports.get()[0]
self.isOnline = True # Assume we're connected to the internet
# list of timer instances

View file

@ -25,6 +25,6 @@ def add_bootstrap_list_to_peer_list(comm_inst, peerList):
Add the bootstrap list to the peer list (no duplicates)
'''
for i in bootstrap_peers:
if i not in peerList and i not in comm_inst.offlinePeers and i != gettransports.get()[0] and len(str(i).strip()) > 0:
if i not in peerList and i not in comm_inst.offlinePeers and not i in gettransports.get() and len(str(i).strip()) > 0:
peerList.append(i)
keydb.addkeys.add_address(i)