test

Signed-off-by: Abhishek Choudhary <[email protected]>

Author: shreemaan-abhishek

.github/workflows/test.yaml

@@ -0,0 +1,41 @@
+name: test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: "ubuntu-20.04"
+    env:
+      OPENRESTY_PREFIX: "/usr/local/openresty"
+
+    steps:
+      - name: Check out code
+        uses: actions/[email protected]
+        with:
+          submodules: recursive
+
+      - name: Linux Get dependencies
+        run: |
+          sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl lua5.1 liblua5.1-0-dev
+
+      - name: Linux Before install
+        run: |
+          sudo cpanm --notest Test::Nginx > build.log 2>&1 || (cat build.log && exit 1)
+
+      - name: Linux Install
+        run: |
+          wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
+          sudo apt-get -y install software-properties-common
+          sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main"
+          sudo apt-get update
+          sudo apt-get install openresty
+          git clone https://github.com/openresty/test-nginx.git test-nginx
+
+      - name: Linux Script
+        run: |
+          export PATH=$OPENRESTY_PREFIX/nginx/sbin:$PATH
+          make test

lib/resty/limit/count.lua

@@ -125,16 +125,16 @@ function _M.uncommit(self, key)
     local dict = self.dict
     local limit = self.limit
 
-    local remaining, err = dict:incr(key, 1)
-    if not remaining then
+    local consumed, err = dict:incr(key, -1)
+    if not consumed then
         if err == "not found" then
-            remaining = limit
+            consumed = limit
         else
             return nil, err
         end
     end
 
-    return remaining
+    return consumed
 end
 
 

t/count.t

@@ -34,14 +34,15 @@ __DATA__
         content_by_lua_block {
             local limit_count = require "resty.limit.count"
             ngx.shared.store:flush_all()
-            local lim = limit_count.new("store", 10, 100)
+            local limit = 10
+            local lim = limit_count.new("store", limit, 100)
             local uri = ngx.var.uri
             for i = 1, 12 do
                 local delay, err = lim:incoming(uri, true)
                 if not delay then
                     ngx.say(err)
                 else
-                    local remaining = err
+                    local remaining = limit - err
                     ngx.say("remaining: ", remaining)
                 end
             end
@@ -75,36 +76,37 @@ rejected
         content_by_lua_block {
             local limit_count = require "resty.limit.count"
             ngx.shared.store:flush_all()
-            local lim = limit_count.new("store", 1, 10)
+            local limit = 1
+            local lim = limit_count.new("store", limit, 10)
             local delay1, err1 = lim:incoming("foo", true)
             local delay2, err2 = lim:incoming("foo", true)
             local delay3, err3 = lim:incoming("bar", true)
             local delay4, err4 = lim:incoming("bar", true)
             if not delay1 then
                 ngx.say(err1)
             else
-                local remaining1 = err1
+                local remaining1 = limit - err1
                 ngx.say("remaining1: ", remaining1)
             end
 
             if not delay2 then
                 ngx.say(err2)
             else
-                local remaining2 = err2
+                local remaining2 = limit - err2
                 ngx.say("remaining2: ", remaining2)
             end
 
             if not delay3 then
                 ngx.say(err3)
             else
-                local remaining3 = err3
+                local remaining3 = limit -err3
                 ngx.say("remaining3: ", remaining3)
             end
 
             if not delay4 then
                 ngx.say(err4)
             else
-                local remaining4 = err4
+                local remaining4 = limit - err4
                 ngx.say("remaining4: ", remaining4)
             end
         }
@@ -129,23 +131,24 @@ rejected
         content_by_lua_block {
             local limit_count = require "resty.limit.count"
             ngx.shared.store:flush_all()
-            local lim = limit_count.new("store", 1, 1)
+            local limit = 1
+            local lim = limit_count.new("store", limit, 1)
 
             local uri = ngx.var.uri
             for i = 1, 2 do
                 local delay, err = lim:incoming(uri, true)
                 if not delay then
                     ngx.say(err)
                 else
-                    local remaining = err
+                    local remaining = limit -  err
                     ngx.say("remaining: ", remaining)
                 end
 
                 local delay, err = lim:incoming(uri, true)
                 if not delay then
                     ngx.say(err)
                 else
-                    local remaining = err
+                    local remaining = limit - err
                     ngx.say("remaining: ", remaining)
                 end
                 ngx.sleep(1)
@@ -172,15 +175,16 @@ rejected
         content_by_lua_block {
             local limit_count = require "resty.limit.count"
             ngx.shared.store:flush_all()
-            local lim = limit_count.new("store", 5, 10)
+            local limit = 5
+            local lim = limit_count.new("store", limit, 10)
             local begin = ngx.time()
 
             for i = 1, 4 do
                 local delay, err = lim:incoming("foo", i < 3)
                 if not delay then
                     ngx.say(err)
                 else
-                    local remaining = err
+                    local remaining = limit - err
                     ngx.say("remaining: ", remaining)
                 end
             end
@@ -205,15 +209,16 @@ remaining: 2
     location = /t {
         content_by_lua_block {
             local limit_count = require "resty.limit.count"
-            local lim = limit_count.new("store", 2, 10)
+            local limit = 2
+            local lim = limit_count.new("store", limit, 10)
             ngx.shared.store:flush_all()
             local key = "foo"
             for i = 1, 3 do
                 local delay, err = lim:incoming(key, true)
                 if not delay then
                     ngx.say("failed to limit count: ", err)
                 else
-                    local remaining = err
+                    local remaining = limit - err
                     ngx.say("remaining: ", remaining)
                 end
                 local ok, err = lim:uncommit(key)
@@ -242,14 +247,15 @@ remaining: 1
         content_by_lua_block {
             local limit_count = require "resty.limit.count"
             ngx.shared.store:flush_all()
-            local lim = limit_count.new("store", 10, 100)
+            local limit = 10
+            local lim = limit_count.new("store", limit, 100)
             local uri = ngx.var.uri
             for i = 1, 7 do
                 local delay, err = lim:incoming(uri, true, 2)
                 if not delay then
                     ngx.say(err)
                 else
-                    local remaining = err
+                    local remaining = limit - err
                     ngx.say("remaining: ", remaining)
                 end
             end