diff options
| -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), |