diff --git a/api.py b/api.py index 0649644..2afb6d4 100644 --- a/api.py +++ b/api.py @@ -43,6 +43,32 @@ from pymongo import MongoClient import sender as sender +LOGGING_CONFIG = { + "version": 1, + "disable_existing_loggers": False, + "formatters": { + "default": { + "()": "uvicorn.logging.DefaultFormatter", + "fmt": "%(asctime)s %(levelprefix)s %(message)s", + "datefmt": "%Y-%m-%d %H:%M:%S", + }, + "access": { + "()": "uvicorn.logging.AccessFormatter", + "fmt": '%(asctime)s %(levelprefix)s %(client_addr)s - "%(request_line)s" %(status_code)s', + "datefmt": "%Y-%m-%d %H:%M:%S", + }, + }, + "handlers": { + "default": {"formatter": "default", "class": "logging.StreamHandler", "stream": "ext://sys.stderr"}, + "access": {"formatter": "access", "class": "logging.StreamHandler", "stream": "ext://sys.stdout"}, + }, + "loggers": { + "uvicorn": {"handlers": ["default"], "level": "INFO"}, + "uvicorn.error": {"level": "INFO"}, + "uvicorn.access": {"handlers": ["access"], "level": "INFO", "propagate": False}, + }, +} + CONFIG_PATH = os.environ.get("DICOM_API_CONFIG", os.path.join(os.path.dirname(__file__), "config.json")) with open(CONFIG_PATH, "r", encoding="utf-8") as f: @@ -326,4 +352,4 @@ def get_job(job_id: str): if __name__ == "__main__": import uvicorn - uvicorn.run(app, host=CONFIG["server"]["host"], port=CONFIG["server"]["port"]) \ No newline at end of file + uvicorn.run(app, host=CONFIG["server"]["host"], port=CONFIG["server"]["port"], log_config=LOGGING_CONFIG) \ No newline at end of file diff --git a/config.json b/config.json index a88c0ab..6ab42a2 100644 --- a/config.json +++ b/config.json @@ -16,7 +16,8 @@ }, "path_mappings": [ {"from": "/mnt/pacs_data", "to": "/data"}, - {"from": "Z:/2026", "to": "Z:/2026"} + {"from": "Z:/2026", "to": "Z:/2026"}, + {"from": "/mnt/data/2026", "to": "Z:/2026"} ], "send_delay": 0.0, "max_concurrent_jobs": 1000,