diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-10-19 17:55:19 +0300 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-10-21 18:47:38 +0300 |
| commit | b0fe11ffc4921c606b78ceb9756cc44579689005 (patch) | |
| tree | 0ac0a17398119b5ea9fb74fc936617866c4f086c | |
| parent | 7d15284db55a22c8940042d72ffca3de8f9313da (diff) | |
luci-base: set the fallback default of rollback timeout to 90s
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>
| -rw-r--r-- | modules/luci-base/luasrc/model/uci.lua | 4 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/header.htm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/luci-base/luasrc/model/uci.lua b/modules/luci-base/luasrc/model/uci.lua index a50e28a87..816f6f205 100644 --- a/modules/luci-base/luasrc/model/uci.lua +++ b/modules/luci-base/luasrc/model/uci.lua @@ -123,10 +123,10 @@ function apply(self, rollback) if rollback then local sys = require "luci.sys" 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", { - timeout = (timeout > 30) and timeout or 30, + timeout = (timeout > 90) and timeout or 90, rollback = true }) diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm index e7b2d4787..cffe9482c 100644 --- a/modules/luci-base/luasrc/view/header.htm +++ b/modules/luci-base/luasrc/view/header.htm @@ -29,7 +29,7 @@ ubuspath = luci.config.main.ubuspath or '/ubus/', sessionid = luci.dispatcher.context.authsession, 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_timeout = math.max(applyconf and applyconf.timeout or 5, 1), apply_display = math.max(applyconf and applyconf.display or 1.5, 1), |