diff --git a/tljh/config.py b/tljh/config.py index a9855d0..8c3c050 100644 --- a/tljh/config.py +++ b/tljh/config.py @@ -225,6 +225,9 @@ def main(argv=None): if argv is None: argv = sys.argv[1:] + from .log import init_logging + init_logging() + argparser = argparse.ArgumentParser() argparser.add_argument( '--config-path', diff --git a/tljh/installer.py b/tljh/installer.py index 70049a8..d45b51e 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -31,20 +31,8 @@ HERE = os.path.abspath(os.path.dirname(__file__)) rt_yaml = YAML() -# Set up logging to print to a file and to stderr logger = logging.getLogger(__name__) -os.makedirs(INSTALL_PREFIX, exist_ok=True) -file_logger = logging.FileHandler(os.path.join(INSTALL_PREFIX, 'installer.log')) -file_logger.setFormatter(logging.Formatter('%(asctime)s %(message)s')) -logger.addHandler(file_logger) - -stderr_logger = logging.StreamHandler() -stderr_logger.setFormatter(logging.Formatter('%(message)s')) -logger.addHandler(stderr_logger) -logger.setLevel(logging.INFO) - - def ensure_node(): """ Ensure nodejs from nodesource is installed @@ -423,6 +411,9 @@ def ensure_config_yaml(plugin_manager): def main(): + from .log import init_logging + init_logging() + argparser = argparse.ArgumentParser() argparser.add_argument( '--admin', diff --git a/tljh/log.py b/tljh/log.py new file mode 100644 index 0000000..f626c96 --- /dev/null +++ b/tljh/log.py @@ -0,0 +1,19 @@ +"""Setup tljh logging""" +import os +import logging + +from .config import INSTALL_PREFIX + + +def init_logging(): + """Setup default tljh logger""" + logger = logging.getLogger("tljh") + os.makedirs(INSTALL_PREFIX, exist_ok=True) + file_logger = logging.FileHandler(os.path.join(INSTALL_PREFIX, "installer.log")) + file_logger.setFormatter(logging.Formatter("%(asctime)s %(message)s")) + logger.addHandler(file_logger) + + stderr_logger = logging.StreamHandler() + stderr_logger.setFormatter(logging.Formatter("%(message)s")) + logger.addHandler(stderr_logger) + logger.setLevel(logging.INFO)