Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ensaremirerol committed Jan 4, 2025
1 parent ff1a93e commit 8862dac
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
1 change: 1 addition & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ package-win: install-dev
--include-data-dir=public=public \
--include-data-dir=bin=bin \
--windows-disable-console \
--onefile \
main.py
16 changes: 13 additions & 3 deletions server/logger.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import logging
import sys
from pathlib import Path

import structlog
from structlog.types import EventDict, Processor


def drop_color_message_key(
_, __, event_dict: EventDict
logger, method_name, event_dict: EventDict
) -> EventDict:
"""
Uvicorn logs the message a second time in the extra `color_message`, but we don't
Expand All @@ -19,7 +20,7 @@ def drop_color_message_key(
def setup_logging(
json_logs: bool = False, log_level: str = "INFO"
):
timestamper = structlog.processors.TimeStamper(
time_stamper = structlog.processors.TimeStamper(
fmt="iso"
)

Expand All @@ -30,7 +31,7 @@ def setup_logging(
structlog.stdlib.PositionalArgumentsFormatter(),
structlog.stdlib.ExtraAdder(),
drop_color_message_key,
timestamper,
time_stamper,
structlog.processors.StackInfoRenderer(),
structlog.processors.format_exc_info,
]
Expand Down Expand Up @@ -73,10 +74,19 @@ def setup_logging(
)

handler = logging.StreamHandler()
file_handler = logging.FileHandler(
(
Path.home() / "rdfcraft" / "rdfcraft.log"
).resolve(),
mode="a",
encoding="utf-8",
)
# Use OUR `ProcessorFormatter` to format all `logging` entries.
handler.setFormatter(fmt=formatter)
file_handler.setFormatter(fmt=formatter)
root_logger = logging.getLogger()
root_logger.addHandler(handler)
root_logger.addHandler(file_handler)
root_logger.setLevel(log_level.upper())

for _log in ["uvicorn", "uvicorn.error"]:
Expand Down
2 changes: 1 addition & 1 deletion server/services/core/mapping_to_yarrrml_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def convert_mapping_to_yarrrml(

temp_file_path: Path = (
self.temp_dir
/ f"yarrrml-{mapping.name}-{datetime.datetime.now().isoformat()}.yml"
/ f"yarrrml-{mapping.name}-{datetime.datetime.now().isoformat().replace(':', '_')}.yml"
)

temp_file_path.touch()
Expand Down

0 comments on commit 8862dac

Please sign in to comment.