Improve console output and status message

This commit is contained in:
Arinerron 2018-05-10 20:19:48 -07:00
parent 6b9f21fd08
commit adc85c76c4
No known key found for this signature in database
GPG key ID: 99383627861C62F0
6 changed files with 45 additions and 46 deletions

View file

@ -125,15 +125,15 @@ class OnionrUtils:
retVal = False
if newAdderList != False:
for adder in newAdderList.split(','):
if not adder in self._core.listAdders(randomOrder=False) and adder.strip() != self.getMyAddress():
if not adder in self._core.listAdders(randomOrder = False) and adder.strip() != self.getMyAddress():
if self._core.addAddress(adder):
logger.info('Added ' + adder + ' to db.', timestamp=True)
logger.info('Added ' + adder + ' to db.', timestamp = True)
retVal = True
else:
logger.debug(adder + " is either our address or already in our DB")
logger.debug('%s is either our address or already in our DB' % adder)
return retVal
except Exception as error:
logger.error('Failed to merge adders.', error=error)
logger.error('Failed to merge adders.', error = error)
return False
def getMyAddress(self):
@ -141,7 +141,7 @@ class OnionrUtils:
with open('./data/hs/hostname', 'r') as hostname:
return hostname.read().strip()
except Exception as error:
logger.error('Failed to read my address.', error=error)
logger.error('Failed to read my address.', error = error)
return None
def localCommand(self, command, silent = True):