diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2019-12-24 18:54:21 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2020-01-17 18:26:05 +0200 |
| commit | c81d6fc2ce59212a4cdee9244417dd86a15e8844 (patch) | |
| tree | f859f4ea904d3ff9f7230bc6d45549ddbefbbf52 | |
| parent | 168aa5fea17fab9c1e6843ee9f8ed5339c20b33f (diff) | |
| download | awall-c81d6fc2ce59212a4cdee9244417dd86a15e8844.tar.bz2 awall-c81d6fc2ce59212a4cdee9244417dd86a15e8844.tar.xz | |
util: execute function
| -rw-r--r-- | awall/ipset.lua | 9 | ||||
| -rw-r--r-- | awall/util.lua | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/awall/ipset.lua b/awall/ipset.lua index ba20dec..05b3e28 100644 --- a/awall/ipset.lua +++ b/awall/ipset.lua @@ -1,12 +1,11 @@ --[[ Ipset file dumper for Alpine Wall -Copyright (C) 2012-2019 Kaarle Ritvanen +Copyright (C) 2012-2020 Kaarle Ritvanen See LICENSE file for license details ]]-- local util = require('awall.util') -local lpc = require('lpc') local IPSet = require('awall.class')() @@ -21,10 +20,8 @@ end function IPSet:create() for name, ipset in pairs(self.config) do - if lpc.wait( - util.run( - 'ipset', '-!', 'create', name, table.unpack(ipset.options) - ) + if util.execute( + 'ipset', '-!', 'create', name, table.unpack(ipset.options) ) ~= 0 then util.printmsg('ipset creation failed: '..name) end diff --git a/awall/util.lua b/awall/util.lua index a7eda03..06ea043 100644 --- a/awall/util.lua +++ b/awall/util.lua @@ -167,4 +167,6 @@ function M.run(...) return pid end +function M.execute(...) return lpc.wait(M.run(...)) end + return M |