request_caching only reads from memory

Author: ddragosd

README.md

@@ -15,7 +15,7 @@ Table of Contents
 Status
 ======
 
-This library is still under active development and is NOT YET production ready.
+This library is under development and is considered production ready.
 
 Synopsis
 ========

src/lua/api-gateway/cache/request/rcache.lua

@@ -28,19 +28,12 @@ function _M:new(o)
     return o
 end
 
-
---- This method returns the request body using Lua functions.
---  There are 2 functions used:
---  1. ngx.req.get_body_data() - returning nil if
---      1. the request body has not been read,
---      2. the request body has been read into disk temporary files,
---      3. or the request body has zero size.
---  2. ngx.req.get_body_file()
---     If the request body has been read into disk files, ngx.req.get_body_file() function may be used instead.
---
+--- This method returns the request body.
+--   srcache module is loading the request body from memory.
+--   see: https://groups.google.com/forum/#!topic/openresty-en/Tc5ovYyNMGU
 local function readRequestBody()
     ngx.req.read_body()
-    return ngx.req.get_body_data() or ngx.req.get_body_file()
+    return ngx.req.get_body_data()
 end
 
 --- Stores the given key into the given cache instance.
@@ -49,7 +42,11 @@ end
 -- @param key the key to save
 --
 local function put(cache, key)
-    local value = readRequestBody()
+    local pcall_ok, value = pcall(readRequestBody)
+    if (not pcall_ok) then
+        ngx.log(ngx.WARN, "Could not read request body. Check the logs for more info.")
+        return
+    end
     --ngx.log(ngx.DEBUG, "Storing value=", tostring(value), " into key=", tostring(key), " in cache")
     ngx.log(ngx.DEBUG, "Storing key=", tostring(key), " in cache.")
     if (value ~= nil) then

test/manual/README.md

@@ -12,4 +12,5 @@ Test manually caching with an external HTTP Client ( Browser, JMeter, etc )
 make test-docker-manual
 ```
 
-Then open the browser to `http://<docker_ip>/cache/favicon.ico` , `http://<docker_ip>/cache/index.html` and refresh the page to retrieve the content from cache. 
+Then open the browser to `http://<docker_ip>/cache/favicon.ico` , `http://<docker_ip>/cache/index.html` 
+or `http://<docker_ip>/cache/img_test.JPG` and refresh the page to retrieve the content from cache. 

test/manual/api-gateway-config/conf.d/includes/basic_endpoints.conf

@@ -26,6 +26,10 @@ location = /request-caching {
     set $subrequest_method $echo_request_method;
     set_escape_uri $escaped_key $arg_key;
 
+    client_max_body_size 35m;
+    # http://nginx.org/en/docs/http/ngx_http_core_module.html#client_body_in_file_only
+    client_body_in_file_only on;
+
     content_by_lua '
         local sr_method = ngx.var.subrequest_method
         local cache = ngx.apiGateway.request_cache
@@ -66,11 +70,17 @@ location = /html/index.html {
     root   /etc/api-gateway/;
 }
 
+location = /html/img_test.JPG {
+    default_type image/jpeg;
+    expires 25s;
+    root   /etc/api-gateway/;
+}
+
 location ~ ^/cache/(?<subpath>.+) {
     sendfile off;
 
     srcache_default_expire 1000s;
-    srcache_request_cache_control on; # onor Cache-control: no-cache and Pragma:no-cache
+    srcache_request_cache_control on; # honor Cache-control: no-cache and Pragma:no-cache
 
     set $key $request_uri;
     set_escape_uri $escaped_key $key;
@@ -79,11 +89,12 @@ location ~ ^/cache/(?<subpath>.+) {
     # This directive controls what responses to store to the cache according to their status code.
     srcache_store_statuses 200 301 302;
 
-    # force small buffers for test
-    proxy_buffer_size 1k;
-    proxy_buffers 2 1k;
-    proxy_buffering on;
-    proxy_busy_buffers_size 1k;
+
+        # force small buffers for test
+        # proxy_buffer_size 1k;
+        # proxy_buffers 2 1k;
+        # proxy_buffering on;
+        # proxy_busy_buffers_size 1k;
 
     # proxy_pass/fastcgi_pass/drizzle_pass/echo/etc...
     # or even static files on the disk

test/manual/api-gateway-config/html/img_test.JPG

@@ -41,14 +41,14 @@ local function initRequestCaching(parentObject)
     local cache_cls = require "api-gateway.cache.cache"
     parentObject.request_cache = cache_cls:new()
 
-    local local_cache_max_ttl = 1000
+    local local_cache_max_ttl = 10
     local local_cache = require "api-gateway.cache.store.localCache":new({
         dict = "cachedkeys", -- defined in nginx conf as lua_shared_dict cachedkey 50m;
         ttl = function (value)
             return math.min(local_cache_max_ttl,(ngx.var.arg_exptime or local_cache_max_ttl))
         end
     })
-    local redis_cache_max_ttl = 2000
+    local redis_cache_max_ttl = 20
     local redis_cache = require "api-gateway.cache.store.redisSetCache":new({
         ttl = function(value)
             -- ngx.var.arg_exptime is automatically set when