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

luci-base: set the fallback default of rollback timeout to 90s

Browse source 
Set the fallback value of the config change rollback timeout
to 90 seconds to match the change in /etc/config/luci by commit
81cf99a50.

That commit changed the value in the config file, but did
not change the underlying fallback values that do get applied
when there is no proper config item in etc/config/luci.

Users sysupgrading from old systems may have carried an ancient
/etc/config/luci (without rollback config) with them, so this
change should help them to see the intended user experience.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2020-10-19 17:55:19 +03:00
parent 7d15284db5
commit b0fe11ffc4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/luci-base/luasrc/model/uci.lua
View file

@ -123,10 +123,10 @@ function apply(self, rollback)
if rollback then if rollback then
local sys = require "luci.sys" local sys = require "luci.sys"
local conf = require "luci.config" local conf = require "luci.config"
local timeout = tonumber(conf and conf.apply and conf.apply.rollback or 30) or 0 local timeout = tonumber(conf and conf.apply and conf.apply.rollback or 90) or 0
_, err = call("apply", { _, err = call("apply", {
timeout = (timeout > 30) and timeout or 30, timeout = (timeout > 90) and timeout or 90,
rollback = true rollback = true
}) })

2
modules/luci-base/luasrc/view/header.htm
View file

@ -29,7 +29,7 @@
ubuspath = luci.config.main.ubuspath or '/ubus/', ubuspath = luci.config.main.ubuspath or '/ubus/',
sessionid = luci.dispatcher.context.authsession, sessionid = luci.dispatcher.context.authsession,
nodespec = luci.dispatcher.context.dispatched, nodespec = luci.dispatcher.context.dispatched,
apply_rollback = math.max(applyconf and applyconf.rollback or 30, 30), apply_rollback = math.max(applyconf and applyconf.rollback or 90, 90),
apply_holdoff = math.max(applyconf and applyconf.holdoff or 4, 1), apply_holdoff = math.max(applyconf and applyconf.holdoff or 4, 1),
apply_timeout = math.max(applyconf and applyconf.timeout or 5, 1), apply_timeout = math.max(applyconf and applyconf.timeout or 5, 1),
apply_display = math.max(applyconf and applyconf.display or 1.5, 1), apply_display = math.max(applyconf and applyconf.display or 1.5, 1),