diff --git a/template/{{ part_dir }}/.env.example.jinja b/template/{{ part_dir }}/.env.example.jinja index 5a44a74..5397e9b 100644 --- a/template/{{ part_dir }}/.env.example.jinja +++ b/template/{{ part_dir }}/.env.example.jinja @@ -1,7 +1,7 @@ {%- set groups = [] -%} {%- if layout == 'root' %}{% set _ = groups.append(["COMPOSE_PROFILES=" ~ ("external," if database != 'none' or use_redis else "") ~ "services"]) %}{% endif -%} {%- set _ = groups.append(["RUN_ENVIRONMENT=prod", "TZ=UTC"]) -%} -{%- set _ = groups.append(["LOG__LEVEL=INFO", "LOG__LEVEL_EXTERNAL=WARNING", "LOG__SHOW_TIME=false", "LOG__CONSOLE_WIDTH=150"]) -%} +{%- set _ = groups.append(["LOG__LEVEL=INFO", "LOG__LEVEL_EXTERNAL=WARNING", "LOG__SHOW_TIME=false", "LOG__SHOW_LOCALS=false", "LOG__CONSOLE_WIDTH=150"]) -%} {%- if database == 'mongo' %}{% set _ = groups.append(["DB__HOST=mongodb", "DB__PORT=27017", "DB__USER=" ~ project_slug, "DB__PASSWORD=" ~ project_slug, "DB__DB_NAME=" ~ project_slug, "DB__SCRIPTS_CONNECTION_URL=mongodb://" ~ project_slug ~ ":" ~ project_slug ~ "@localhost:27017/" ~ project_slug ~ "?authSource=admin"]) %}{% endif -%} {%- if database == 'postgres' %}{% set _ = groups.append(["DB__HOST=postgres", "DB__PORT=5432", "DB__USER=" ~ project_slug, "DB__PASSWORD=" ~ project_slug, "DB__DB_NAME=" ~ project_slug, "DB__SCRIPTS_CONNECTION_URL=postgresql://" ~ project_slug ~ ":" ~ project_slug ~ "@localhost:5432/" ~ project_slug]) %}{% endif -%} {%- if use_redis %}{% set _ = groups.append(["REDIS__HOST=redis", "REDIS__PORT=6379", "REDIS__CACHE_TTL=300", "REDIS__SCRIPTS_CONNECTION_URL=redis://localhost:6379/0"]) %}{% endif -%} diff --git a/template/{{ part_dir }}/src/utils/env.py.jinja b/template/{{ part_dir }}/src/utils/env.py.jinja index 5692494..f60be6b 100644 --- a/template/{{ part_dir }}/src/utils/env.py.jinja +++ b/template/{{ part_dir }}/src/utils/env.py.jinja @@ -22,6 +22,7 @@ class LogSettings(Section): level: str = "INFO" level_external: str = "WARNING" show_time: bool = False + show_locals: bool = False console_width: int = 150 {% if database == 'mongo' %} diff --git a/template/{{ part_dir }}/src/utils/logging.py.jinja b/template/{{ part_dir }}/src/utils/logging.py.jinja index 218fcd5..29966cc 100644 --- a/template/{{ part_dir }}/src/utils/logging.py.jinja +++ b/template/{{ part_dir }}/src/utils/logging.py.jinja @@ -28,7 +28,7 @@ def setup_logging() -> None: markup=True, rich_tracebacks=True, enable_link_path=False, - tracebacks_show_locals=True, + tracebacks_show_locals=env.log.show_locals, omit_repeated_times=False, show_time=env.log.show_time, {%- if 'aiogram_bot' in backend_services %} @@ -37,7 +37,7 @@ def setup_logging() -> None: ) ], ) - install(console=console, show_locals=True) + install(console=console, show_locals=env.log.show_locals) logger = logging.getLogger("{{ project_slug }}")