make timeout not always an error

Author: jprjr

README.md

@@ -102,6 +102,19 @@ local res, err = prog('some-program')
 
 ```
 
+### Treat timeouts as non-errors
+
+By default, `sockexec` treats a timeout as an error. You can disable this by
+setting the object's `timeout_fatal` key to false. Examples:
+
+```lua
+-- set timeout_fatal = false on the prog objects
+prog.timeout_fatal = false
+
+-- or, set it at calltime:
+local res, err = prog({argv = {'cat'}, timeout_fatal = false})
+```
+
 ### But I actually want a shell!
 
 Not a problem! You can just do something like:

dist.ini

@@ -1,5 +1,5 @@
 name = lua-resty-exec
-version = 1.1.2
+version = 1.1.3
 abstract = Run external programs in OpenResty without spawning a shell or blocking
 author = John Regan
 is_original = yes

lib/resty/exec.lua

@@ -18,7 +18,7 @@ end
 
 
 local _M = {
-  _VERSION = '1.1.2'
+  _VERSION = '1.1.3'
 }
 
 function _M.new(address)
@@ -32,7 +32,8 @@ function _M.new(address)
         stdin = nil,
         stdout = nil,
         stderr = nil,
-        bufsize = 4096
+        bufsize = 4096,
+        timeout_fatal = true,
     }
 
     function o.exec(self,...)
@@ -52,6 +53,7 @@ function _M.new(address)
                     end
                 end
                 if args[1].stdin then self.stdin = args[1].stdin end
+                if args[1].timeout_fatal then self.timeout_fatal = args[1].timeout_fatal end
             else
                 self.argv = args
             end
@@ -80,8 +82,20 @@ function _M.new(address)
 
         while(not err) do
             data, err, partial = c:receive(self.bufsize)
-            if err and err ~= "closed" then
-               return nil, err
+            if err then
+                if err == 'timeout' then
+                    if self.timeout_fatal then
+                        return nil, err
+                   else
+                        err = nil
+                    end
+                else
+                    if err ~= 'timeout' and err ~= 'closed' then
+                        return nil, err
+                    else
+                        err = nil
+                    end
+                end
             end
 
             if data then

rockspecs/lua-resty-exec-1.1.3-0.rockspec

@@ -0,0 +1,21 @@
+package = "lua-resty-exec"
+version = "1.1.3-0"
+source = {
+    url = "https://github.com/jprjr/lua-resty-exec/archive/1.1.3.tar.gz",
+    file = "lua-resty-exec-1.1.3.tar.gz"
+}
+description = {
+    summary = "Run external programs in OpenResty without spawning a shell",
+    homepage = "https://github.com/jprjr/lua-resty-exec",
+    license = "MIT"
+}
+build = {
+    type = "builtin",
+    modules = {
+        ["resty.exec"] = "lib/resty/exec.lua"
+    }
+}
+dependencies = {
+    "lua >= 5.1",
+    "netstring >= 1.0.2"
+}