From fe219db2317489fcc349eaf0db7b5c600d098750 Mon Sep 17 00:00:00 2001 From: Markus Padourek Date: Wed, 26 Sep 2018 16:26:38 +0200 Subject: [PATCH 1/2] Ensure monitoring for custom error pages Fixes #3140 --- rootfs/etc/nginx/template/nginx.tmpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index d50b08af7d..a4dc3ee29a 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -786,6 +786,12 @@ stream { {{ else }} proxy_pass http://upstream-default-backend; {{ end }} + + {{ if not $all.DisableLua }} + log_by_lua_block { + monitor.call() + } + {{ end }} } {{ end }} {{ end }} From a2ccd1f224474bf8a60b0a98b681840126b0fe82 Mon Sep 17 00:00:00 2001 From: Globegitter Date: Wed, 26 Sep 2018 16:38:16 +0200 Subject: [PATCH 2/2] Fix usage for $all. --- rootfs/etc/nginx/template/nginx.tmpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index a4dc3ee29a..9502cd28fe 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -786,8 +786,7 @@ stream { {{ else }} proxy_pass http://upstream-default-backend; {{ end }} - - {{ if not $all.DisableLua }} + {{ if not .DisableLua }} log_by_lua_block { monitor.call() }