Ensure logging is configured early in shared.py (#7604)

Otherwise if top level code tries to use the logger it
won't be configured yet.
This commit is contained in:
Sam Clegg 2018-12-04 09:47:19 -08:00 коммит произвёл GitHub
Родитель 3e19355481
Коммит 91d52039f3
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 9 добавлений и 15 удалений

Просмотреть файл

@ -2258,5 +2258,5 @@ def main(infile, outfile, memfile, libraries):
emscripter = emscript_wasm_backend if shared.Settings.WASM_BACKEND else emscript
return temp_files.run_and_clean(lambda: emscripter(
infile, outfile_obj, memfile, libraries, shared.COMPILER_ENGINE, temp_files, get_configuration().DEBUG)
infile, outfile_obj, memfile, libraries, shared.COMPILER_ENGINE, temp_files, shared.DEBUG)
)

Просмотреть файл

@ -27,13 +27,16 @@ from .tempfiles import try_delete
from . import jsrun, cache, tempfiles, colored_logger
from . import response_file
colored_logger.enable()
__rootpath__ = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
WINDOWS = sys.platform.startswith('win')
MACOS = sys.platform == 'darwin'
LINUX = sys.platform.startswith('linux')
DEBUG = int(os.environ.get('EMCC_DEBUG', '0'))
# can add %(asctime)s to see timestamps
logging.basicConfig(format='%(name)s:%(levelname)s: %(message)s',
level=logging.DEBUG if DEBUG else logging.INFO)
colored_logger.enable()
logger = logging.getLogger('shared')
@ -870,7 +873,6 @@ class WarningManager(object):
class Configuration(object):
def __init__(self, environ=os.environ):
self.DEBUG = int(environ.get('EMCC_DEBUG', '0'))
self.EMSCRIPTEN_TEMP_DIR = None
if "EMCC_TEMP_DIR" in environ:
@ -888,7 +890,7 @@ class Configuration(object):
self.CANONICAL_TEMP_DIR = get_canonical_temp_dir(self.TEMP_DIR)
if self.DEBUG:
if DEBUG:
try:
self.EMSCRIPTEN_TEMP_DIR = self.CANONICAL_TEMP_DIR
safe_ensure_dirs(self.EMSCRIPTEN_TEMP_DIR)
@ -897,27 +899,19 @@ class Configuration(object):
def get_temp_files(self):
return tempfiles.TempFiles(
tmp=self.TEMP_DIR if not self.DEBUG else get_emscripten_temp_dir(),
tmp=self.TEMP_DIR if not DEBUG else get_emscripten_temp_dir(),
save_debug_files=os.environ.get('EMCC_DEBUG_SAVE'))
def apply_configuration():
global configuration, DEBUG, EMSCRIPTEN_TEMP_DIR, CANONICAL_TEMP_DIR, TEMP_DIR
global configuration, EMSCRIPTEN_TEMP_DIR, CANONICAL_TEMP_DIR, TEMP_DIR
configuration = Configuration()
DEBUG = configuration.DEBUG
EMSCRIPTEN_TEMP_DIR = configuration.EMSCRIPTEN_TEMP_DIR
CANONICAL_TEMP_DIR = configuration.CANONICAL_TEMP_DIR
TEMP_DIR = configuration.TEMP_DIR
def set_logging():
level = logging.DEBUG if DEBUG else logging.INFO
# can add %(asctime)s to see timestamps
logging.basicConfig(format='%(name)s:%(levelname)s: %(message)s', level=level)
apply_configuration()
set_logging()
# EM_CONFIG stuff
if JS_ENGINES is None: