Commit 846c1982 authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

fixes #6 add missing log level

parent 6353199f

circe/__init__.py

+5 −1
Original line number Diff line number Diff line
@@ -286,7 +286,11 @@ if CONFIG["CIRCE_ENABLE_WEB_UI"]: 
            handler: logging.FileHandler = logging.FileHandler(

                "{}/out.log".format(session_dir)

            )

            handler.setFormatter(jsonlogger.JsonFormatter())

            handler.setFormatter(

                tasks.CustomJsonFormatter(

                    "%(timestamp)s %(level)s %(name)s %(message)s"

                )

            )

            logger: logging.Logger = logging.Logger("job_logger_{}".format(session_id))

            logger.setLevel(logging.DEBUG)

            logger.addHandler(handler)

circe/tasks.py

+16 −1
Original line number Diff line number Diff line
@@ -26,6 +26,19 @@ def _stamp(): 
registered_transfos = {}





class CustomJsonFormatter(jsonlogger.JsonFormatter):

    def add_fields(self, log_record, record, message_dict):

        super(CustomJsonFormatter, self).add_fields(log_record, record, message_dict)

        if not log_record.get("timestamp"):

            # this doesn't use record.created, so it is slightly off

            now = datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ")

            log_record["timestamp"] = now

        if log_record.get("level"):

            log_record["level"] = log_record["level"].upper()

        else:

            log_record["level"] = record.levelname





if CONFIG["CIRCE_TRANSFORMATIONS_MODULE"]:

    transformations_module = __import__(CONFIG["CIRCE_TRANSFORMATIONS_MODULE"])

    for transformation_name, _ in getmembers(transformations_module):
@@ -91,7 +104,9 @@ def do_transformations(uuid: uuid4, job_archive_path: str): 
    with tempfile.TemporaryDirectory() as tmp_dir:



        handler: logging.FileHandler = logging.FileHandler("{}/out.log".format(tmp_dir))

        handler.setFormatter(jsonlogger.JsonFormatter())

        handler.setFormatter(

            CustomJsonFormatter("%(timestamp)s %(level)s %(name)s %(message)s")

        )

        logger: logging.Logger = logging.Logger("job_logger_{}".format(uuid.hex))

        logger.setLevel(logging.DEBUG)

        logger.addHandler(handler)

setup.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh: 


setuptools.setup(

    name="circe-CERTIC",

    version="0.0.21",

    version="0.0.22",

    author="Mickaël Desfrênes",

    author_email="mickael.desfrenes@unicaen.fr",

    description="Circe server",