diff --git a/angie/autoconf/core-error-log.conf.j2 b/angie/autoconf/core-error-log.conf.j2 index cd06ec0..5386860 100644 --- a/angie/autoconf/core-error-log.conf.j2 +++ b/angie/autoconf/core-error-log.conf.j2 @@ -1,4 +1,3 @@ -{%- import 'snip/log.j2mod' as ngx_log -%} - -{# {{ ngx_log.error_log(dest='error.log', level=env.NGX_LOGLEVEL) }} #} -{{ ngx_log.error_log(level=env.NGX_LOGLEVEL) }} +{%- import 'snip/log.j2mod' as _log -%} +{#- {{ _log.error_log(dest='error.log', level=env.NGX_LOGLEVEL) }} -#} +{{ _log.error_log(level=env.NGX_LOGLEVEL) }} diff --git a/angie/autoconf/http-access-log/default.conf.j2 b/angie/autoconf/http-access-log/default.conf.j2 index 9bc89db..8fea73a 100644 --- a/angie/autoconf/http-access-log/default.conf.j2 +++ b/angie/autoconf/http-access-log/default.conf.j2 @@ -1,4 +1,3 @@ -{%- import 'snip/log.j2mod' as ngx_log -%} - -{# {{ ngx_log.access_log(dest='access.log', format='main') }} #} -{{ ngx_log.access_log(format='main') }} +{%- import 'snip/log.j2mod' as _log -%} +{#- {{ _log.access_log(dest='access.log', format='main') }} -#} +{{ _log.access_log(format='main') }} diff --git a/angie/snip/log.j2mod b/angie/snip/log.j2mod index 4936496..a959b87 100644 --- a/angie/snip/log.j2mod +++ b/angie/snip/log.j2mod @@ -1,12 +1,35 @@ -{%- macro error_log(dest='error.log', level='warn') %} -error_log {{ '/run/ngx/log'|join_prefix(dest) | ngx_esc }} {{ level | ngx_esc }}; -{%- endmacro %} +{% macro error_log(dest='error.log', level='warn') %} + {%- if dest == 'off' %} +## 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') %} -access_log {{ '/run/ngx/log'|join_prefix(dest) | ngx_esc }} {{ format | ngx_esc }} -{%- for k, v in kwargs|dictsort %} +{% macro access_log(dest='access.log', format='main') %} + {%- 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 %} {{ "{}={}".format(k, v) | ngx_esc }} -{%- endfor %} + {%- endfor %} ; -{%- endmacro %} + {%- endif %} +{% endmacro %}