Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/admin-core: use luci.model.uci.apply() in service control to restart dependencies of the current config as well

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-12-20 19:04:04 +00:00
parent 574eff4e8e
commit 45d604fea3
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/admin-core/luasrc/controller/admin/servicectl.lua
View file

@ -15,12 +15,9 @@ $Id$
module("luci.controller.admin.servicectl", package.seeall) module("luci.controller.admin.servicectl", package.seeall)
function index() function index()
luci.i18n.loadc("base") entry({"servicectl"}, alias("servicectl", "status")).sysauth = "root"
local i18n = luci.i18n.translate entry({"servicectl", "status"}, call("action_status")).leaf = true
entry({"servicectl", "restart"}, call("action_restart")).leaf = true
entry({"servicectl"}, alias("servicectl", "status"), nil, 1).sysauth = "root"
entry({"servicectl", "status"}, call("action_status"), nil, 2).leaf = true
entry({"servicectl", "restart"}, call("action_restart"), nil, 3).leaf = true
end end
function action_status() function action_status()
@ -34,14 +31,18 @@ function action_status()
end end
function action_restart() function action_restart()
if luci.dispatcher.context.requestpath[3] then local uci = require "luci.model.uci".cursor()
local rqp = luci.dispatcher.context.requestpath
if rqp[3] then
local service local service
local services = { } local services = { }
for service in luci.dispatcher.context.requestpath[3]:gmatch("[%w_-]+") do for service in rqp[3]:gmatch("[%w_-]+") do
services[#services+1] = service services[#services+1] = service
end end
local command = uci:apply(services, true)
if nixio.fork() == 0 then if nixio.fork() == 0 then
local i = nixio.open("/dev/null", "r") local i = nixio.open("/dev/null", "r")
local o = nixio.open("/dev/null", "w") local o = nixio.open("/dev/null", "w")
@ -52,7 +53,7 @@ function action_restart()
i:close() i:close()
o:close() o:close()
nixio.exec("/bin/sh", "/sbin/luci-reload", unpack(services)) nixio.exec("/bin/sh", unpack(command))
else else
luci.http.write("OK") luci.http.write("OK")
os.exit(0) os.exit(0)