mirror of
https://github.com/jupyterhub/the-littlest-jupyterhub.git
synced 2025-12-18 21:54:05 +08:00
centralize logging initialization
so it can be shared across modules
This commit is contained in:
@@ -225,6 +225,9 @@ def main(argv=None):
|
|||||||
if argv is None:
|
if argv is None:
|
||||||
argv = sys.argv[1:]
|
argv = sys.argv[1:]
|
||||||
|
|
||||||
|
from .log import init_logging
|
||||||
|
init_logging()
|
||||||
|
|
||||||
argparser = argparse.ArgumentParser()
|
argparser = argparse.ArgumentParser()
|
||||||
argparser.add_argument(
|
argparser.add_argument(
|
||||||
'--config-path',
|
'--config-path',
|
||||||
|
|||||||
@@ -31,20 +31,8 @@ HERE = os.path.abspath(os.path.dirname(__file__))
|
|||||||
|
|
||||||
rt_yaml = YAML()
|
rt_yaml = YAML()
|
||||||
|
|
||||||
# Set up logging to print to a file and to stderr
|
|
||||||
logger = logging.getLogger(__name__)
|
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():
|
def ensure_node():
|
||||||
"""
|
"""
|
||||||
Ensure nodejs from nodesource is installed
|
Ensure nodejs from nodesource is installed
|
||||||
@@ -423,6 +411,9 @@ def ensure_config_yaml(plugin_manager):
|
|||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
from .log import init_logging
|
||||||
|
init_logging()
|
||||||
|
|
||||||
argparser = argparse.ArgumentParser()
|
argparser = argparse.ArgumentParser()
|
||||||
argparser.add_argument(
|
argparser.add_argument(
|
||||||
'--admin',
|
'--admin',
|
||||||
|
|||||||
19
tljh/log.py
Normal file
19
tljh/log.py
Normal file
@@ -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)
|
||||||
Reference in New Issue
Block a user