Fix concurrency issues with Bitpoke built-in full-page cache

Author: calind

php/docker/templates/nginx-conf.d/90-metrics.conf

@@ -72,7 +72,7 @@ log_by_lua_block {
     metrics_nginx["http_requests_total"]:inc(
         1, {
             ngx.var.status,
-            string.lower(ngx.resp.get_headers()["x-cache-fetch"] or "disabled")
+            string.lower(ngx.resp.get_headers()["x-srcache-fetch-status"] or "disabled")
         }
     )
 

php/docker/templates/nginx-vhost-conf.d/page-cache.d/10-index.conf

@@ -33,19 +33,19 @@ set_by_lua_block $skip_cache {
     ngx.ctx.request = request
     local user_agent = ngx.var.http_user_agent or ''
 
-    re = {}
+    local re = {}
     re.wp_loggedin = [[wordpress_logged_in|wordpress_no_cache|comment_author_|wp-postpass_|wp_gdsr_|fbs_|wp-query_monitor_]]
     re.bbpress_cookies = [[EmailID]]
 
-    function find_plain(s, sub)
+    local find_plain = function(s, sub)
         if string.find(s, sub, 1, true) == nil then
             return false
         end
 
         return true
     end
 
-    function Set(list)
+    local Set = function(list)
         local set = {}
         for _, l in ipairs(list) do set[l] = true end
         return set
@@ -147,7 +147,7 @@ rewrite_by_lua_block {
 
     memc:set_timeout(1000)
 
-    local ok, err = memc:connect("{{ $memcachedHost }}:{{ $memcachedPort }}")
+    local ok, err = memc:connect("{{ $memcachedHost }}", "{{ $memcachedPort }}")
     if not ok then
         ngx.log(ngx.ERR, "failed to connect to memcached: ", err)
         return
@@ -235,7 +235,8 @@ srcache_response_cache_control {{ default "on" .Env.STACK_PAGE_CACHE_RESPONSE_CA
 srcache_fetch GET /.stack-cache-fetch $key;
 srcache_store PUT /.stack-cache-store key=$escaped_key&exptime={{ default "360" .Env.STACK_PAGE_CACHE_EXPIRE_SECONDS | atoi }};
 
-more_set_headers "x-cache-fetch $srcache_fetch_status";
+more_set_headers "x-srcache-fetch-status $srcache_fetch_status";
+more_set_headers "x-srcache-store-status $srcache_store_status";
 {{- if isTrue $pageCacheDebug }}
 more_set_headers "x-cache-key $key";
 {{- if eq $chosenBackend "memcached" }}