From faf8d62d5035bb050c04ec5c3a308decf5708b97 Mon Sep 17 00:00:00 2001 From: Abdullah Barrak Date: Fri, 11 Feb 2022 02:45:04 +0300 Subject: [PATCH] fix: cleanup [1316] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` $ make busted-util /usr/local/openresty/luajit/bin/rover exec bin/busted "spec/threescale_utils_spec.lua" ●●● 3 successes / 0 failures / 0 errors / 0 pending : 0.023738 seconds ``` --- gateway/src/apicast/threescale_utils.lua | 4 ++-- spec/threescale_utils_spec.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gateway/src/apicast/threescale_utils.lua b/gateway/src/apicast/threescale_utils.lua index 268d50870..22dedb772 100644 --- a/gateway/src/apicast/threescale_utils.lua +++ b/gateway/src/apicast/threescale_utils.lua @@ -124,7 +124,7 @@ function _M.connect_redis(options) local opts = {} local url = options and options.url or env.get('REDIS_URL') - local resilient = options.resilient or false + local resilient = options.resilient if url then url = resty_url.split(url, 'redis') @@ -194,7 +194,7 @@ function _M.error(resilient, ...) else ngx.status = ngx.HTTP_INTERNAL_SERVER_ERROR ngx.say(...) - if not resilient or resilient == nil then + if not resilient then ngx.exit(ngx.status) end end diff --git a/spec/threescale_utils_spec.lua b/spec/threescale_utils_spec.lua index be7c8bb40..ff64c2aa8 100644 --- a/spec/threescale_utils_spec.lua +++ b/spec/threescale_utils_spec.lua @@ -16,7 +16,7 @@ describe('3scale utils', function() stub(ngx, 'say', function(...) return nil end) local exit = spy.on(ngx, 'exit', function(s) return 'exited!' end) - local error = _M.error(false, 'cache issue ' .. 'host:' .. 6379) + local error = _M.error(nil, 'cache issue ' .. 'host:' .. 6379) assert.spy(ngx.exit).was_called(1) assert.spy(ngx.say).was.called_with('cache issue ' .. 'host:' .. 6379)