krd/angie-conv-image
1
0
Fork 0
Code Activity

conf: improve logging configuration

Browse Source 
- both "error_log()" and "access_log()" now support "syslog:" prefix
- "error_log()" supports "stderr" destination
- both "error_log()" and "access_log()" now support "off" destination (with minor notes for "error_log()")
This commit is contained in:
Konstantin Demin
2025-06-06 11:36:17 +03:00
parent d0ae5d79c9
commit 50d0bbeedf
3 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
angie/autoconf/core-error-log.conf.j2
View File

@@ -1,4 +1,3 @@
{%- import 'snip/log.j2mod' as ngx_log -%} {%- import 'snip/log.j2mod' as _log -%}
{#- {{ _log.error_log(dest='error.log', level=env.NGX_LOGLEVEL) }} -#}
{# {{ ngx_log.error_log(dest='error.log', level=env.NGX_LOGLEVEL) }} #} {{ _log.error_log(level=env.NGX_LOGLEVEL) }}
{{ ngx_log.error_log(level=env.NGX_LOGLEVEL) }}

7
angie/autoconf/http-access-log/default.conf.j2
View File

@@ -1,4 +1,3 @@
{%- import 'snip/log.j2mod' as ngx_log -%} {%- import 'snip/log.j2mod' as _log -%}
{#- {{ _log.access_log(dest='access.log', format='main') }} -#}
{# {{ ngx_log.access_log(dest='access.log', format='main') }} #} {{ _log.access_log(format='main') }}
{{ ngx_log.access_log(format='main') }}

35
angie/snip/log.j2mod
View File

@@ -1,12 +1,35 @@
{%- macro error_log(dest='error.log', level='warn') %} {% macro error_log(dest='error.log', level='warn') %}
error_log {{ '/run/ngx/log'|join_prefix(dest) | ngx_esc }} {{ level | ngx_esc }}; {%- if dest == 'off' %}
{%- endmacro %} ## not a really disabled log but quiet as less as possible
error_log stderr emerg;
{%- else %}
error_log
{%- if dest == 'stderr' %}
{{ dest }}
{%- elif dest.startswith('syslog:') %}
{{ dest | ngx_esc }}
{%- else %}
{{ join_prefix('/run/ngx/log', dest) | ngx_esc }}
{%- endif %}
{{ level | ngx_esc }};
{%- endif %}
{% endmacro %}
{%- macro access_log(dest='access.log', format='main') %} {% macro access_log(dest='access.log', format='main') %}
access_log {{ '/run/ngx/log'|join_prefix(dest) | ngx_esc }} {{ format | ngx_esc }} {%- if dest == 'off' %}
access_log off;
{%- else %}
access_log
{%- if dest.startswith('syslog:') %}
{{ dest | ngx_esc }}
{%- else %}
{{ join_prefix('/run/ngx/log', dest) | ngx_esc }}
{%- endif %}
{{ format | ngx_esc }}
{%- for k, v in kwargs|dictsort %} {%- for k, v in kwargs|dictsort %}
{{ "{}={}".format(k, v) | ngx_esc }} {{ "{}={}".format(k, v) | ngx_esc }}
{%- endfor %} {%- endfor %}
; ;
{%- endmacro %} {%- endif %}
{% endmacro %}