Merge pull request #15 from spacewander/watch_ignore_return

fix watch/ignore return value
smallfish · Feb 20, 2017 · 1370f1e · 1370f1e
2 parents e07553a + d5d0a5d
commit 1370f1e
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 3 deletions.
diff --git a/lib/resty/beanstalkd.lua b/lib/resty/beanstalkd.lua
@@ -95,7 +95,7 @@ function _M.watch(self, tube)
     if size then
         return size, line
     end
-    return 0, line
+    return nil, line
 end
 
 function _M.ignore(self, tube)
@@ -116,7 +116,7 @@ function _M.ignore(self, tube)
     if size then
         return size, line
     end
-    return 0, line
+    return nil, line
 end
 
 function _M.put(self, body, pri, delay, ttr)

diff --git a/t/011-watch.t b/t/011-watch.t
@@ -5,7 +5,7 @@ use Cwd qw(cwd);
 
 repeat_each(2);
 
-plan tests => repeat_each() * (3 * blocks());
+plan tests => repeat_each() * (3 * blocks() + 1);
 
 my $pwd = cwd();
 
@@ -56,3 +56,39 @@ watching: 1
 --- no_error_log
 [error]
 
+=== TEST 2: handle watching failure
+--- http_config eval: $::HttpConfig
+--- config
+    location /t {
+        content_by_lua '
+            local beanstalkd = require "resty.beanstalkd"
+
+            local bean, err = beanstalkd:new()
+
+            local ok, err = bean:connect("127.0.0.1", 2017)
+            if not ok then
+                ngx.say("1: failed to connect: ", err)
+                return
+            end
+
+            local size, err = bean:watch("default")
+            if not size then
+                ngx.say("failed to watch tube: ", err)
+                return
+            end
+            ngx.say("watching: ",  size)
+            bean:close()
+        ';
+    }
+--- request
+GET /t
+--- tcp_listen: 2017
+--- tcp_query eval
+"watch default\r\n"
+--- tcp_reply eval
+"OUT_OF_MEMORY\r\n"
+--- response_body
+failed to watch tube: OUT_OF_MEMORY
+--- no_error_log
+[error]
+
diff --git a/t/012-ignore.t b/t/012-ignore.t
@@ -74,3 +74,37 @@ GET /t
 --- no_error_log
 [error]
 
+
+=== TEST 2: handle ignore failure
+--- http_config eval: $::HttpConfig
+--- config
+    location /t {
+        content_by_lua '
+            local beanstalkd = require "resty.beanstalkd"
+
+            local bean, err = beanstalkd:new()
+
+            local ok, err = bean:connect("127.0.0.1", $TEST_NGINX_BEANSTALKD_PORT)
+            if not ok then
+                ngx.say("1: failed to connect: ", err)
+                return
+            end
+
+            local size, err = bean:ignore("default")
+            if not size then
+                ngx.say("2: failed to ignore tube: ", err)
+                return
+            end
+
+            ngx.say("watching: ",  size)
+
+            bean:close()
+        ';
+    }
+--- request
+GET /t
+--- response_body_like chop
+2: failed to ignore tube: NOT_IGNORED
+--- no_error_log
+[error]
+