Skip to content

Commit d900b9d

Browse files
committed
Added check for logger global before attempting to log in places where logging may occur before the logger is ready
1 parent b500a01 commit d900b9d

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/shared.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,9 @@ def lookupAppdataFolder():
118118
if "HOME" in environ:
119119
dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/'
120120
else:
121-
logger.critical('Could not find home folder, please report this message and your '
122-
'OS X version to the BitMessage Github.')
121+
if 'logger' in globals():
122+
logger.critical('Could not find home folder, please report this message and your '
123+
'OS X version to the BitMessage Github.')
123124
sys.exit()
124125

125126
elif 'win32' in sys.platform or 'win64' in sys.platform:
@@ -133,7 +134,8 @@ def lookupAppdataFolder():
133134

134135
# Migrate existing data to the proper location if this is an existing install
135136
try:
136-
logger.info("Moving data folder to %s" % (dataFolder))
137+
if 'logger' in globals():
138+
logger.info("Moving data folder to %s" % (dataFolder))
137139
move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder)
138140
except IOError:
139141
pass

0 commit comments

Comments
 (0)