Merge pull request #304 from Atheros1/master

[Minor] Move one line of code so that correct program activity is logged
This commit is contained in:
Jonathan Warren 2013-07-15 09:22:27 -07:00
commit 823363b236
2 changed files with 1 additions and 2 deletions

View File

@ -720,7 +720,6 @@ if __name__ == "__main__":
helper_bootstrap.knownNodes() helper_bootstrap.knownNodes()
helper_bootstrap.dns() helper_bootstrap.dns()
# Start the address generation thread # Start the address generation thread
addressGeneratorThread = addressGenerator() addressGeneratorThread = addressGenerator()
addressGeneratorThread.daemon = True # close the main program even if there are threads left addressGeneratorThread.daemon = True # close the main program even if there are threads left

View File

@ -136,12 +136,12 @@ def lookupAppdataFolder():
# Migrate existing data to the proper location if this is an existing install # Migrate existing data to the proper location if this is an existing install
try: try:
move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder)
stringToLog = "Moving data folder to %s" % (dataFolder) stringToLog = "Moving data folder to %s" % (dataFolder)
if 'logger' in globals(): if 'logger' in globals():
logger.info(stringToLog) logger.info(stringToLog)
else: else:
print stringToLog print stringToLog
move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder)
except IOError: except IOError:
pass pass
dataFolder = dataFolder + '/' dataFolder = dataFolder + '/'