citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Added check for logger global before attempting to log in places where logging may occur before the logger is ready

Browse Source
This commit is contained in:
DivineOmega 2013-07-15 10:49:01 +01:00
parent b500a01c33
commit d900b9de70
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared.py
View File

@ -118,8 +118,9 @@ def lookupAppdataFolder():
if "HOME" in environ: if "HOME" in environ:
dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/' dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/'
else: else:
logger.critical('Could not find home folder, please report this message and your ' if 'logger' in globals():
'OS X version to the BitMessage Github.') logger.critical('Could not find home folder, please report this message and your '
'OS X version to the BitMessage Github.')
sys.exit() sys.exit()
elif 'win32' in sys.platform or 'win64' in sys.platform: elif 'win32' in sys.platform or 'win64' in sys.platform:
@ -133,7 +134,8 @@ 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:
logger.info("Moving data folder to %s" % (dataFolder)) if 'logger' in globals():
logger.info("Moving data folder to %s" % (dataFolder))
move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder) move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder)
except IOError: except IOError:
pass pass