webmcp

changeset 488:5b1c4f76e44f

Pass poll message to abort_handler of execute.command{...}
author jbe
date Mon Jun 12 03:32:23 2017 +0200 (2017-06-12)
parents 91d0c8304d74
children 42ddff7319e0
files framework/env/execute/command.lua
line diff
     1.1 --- a/framework/env/execute/command.lua	Mon Jun 12 03:18:54 2017 +0200
     1.2 +++ b/framework/env/execute/command.lua	Mon Jun 12 03:32:23 2017 +0200
     1.3 @@ -35,7 +35,7 @@
     1.4    if args.abortable then
     1.5      local pollready, pollmsg, pollterm = poll(nil, nil, 0, true)
     1.6      if pollterm then
     1.7 -      if args.abort_handler then args.abort_handler() end
     1.8 +      if args.abort_handler then args.abort_handler(pollmsg) end
     1.9        return_error(pollmsg)
    1.10      end
    1.11    end
    1.12 @@ -71,7 +71,7 @@
    1.13      if not pollready then
    1.14        process:kill():wait()
    1.15        if pollterm then
    1.16 -        if args.abort_handler then args.abort_handler() end
    1.17 +        if args.abort_handler then args.abort_handler(pollmsg) end
    1.18        else
    1.19          if args.timeout_handler then args.timeout_handler() end
    1.20        end

Impressum / About Us