From: Wojciech Jowsa <redacted>
Date: Wed, 19 Aug 2020 10:49:03 +0000 (+0200)
Subject: luci-base: Add possiblity to set path and timeout of ubus connection
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1f6dc29f745b3a38d7b5cab709964ad78d69de1c;p=openwrt-luci.git

luci-base: Add possiblity to set path and timeout of ubus connection

It might happen (e.g. when downloading a large file with low speed
connection) that the ubus connection will time out.
The ubus_connect function allows to specify
ubus socket path and ubus connection timeout
so it should allowed to set these arguments from luci.

Signed-off-by: Wojciech Jowsa <redacted>
---

diff --git a/libs/luci-lib-base/luasrc/util.lua b/libs/luci-lib-base/luasrc/util.lua
index 38e00ad83b..89757917ff 100644
--- a/libs/luci-lib-base/luasrc/util.lua
+++ b/libs/luci-lib-base/luasrc/util.lua
@@ -663,9 +663,9 @@ local function ubus_return(...)
 	return ...
 end
 
-function ubus(object, method, data)
+function ubus(object, method, data, path, timeout)
 	if not _ubus_connection then
-		_ubus_connection = _ubus.connect()
+		_ubus_connection = _ubus.connect(path, timeout)
 		assert(_ubus_connection, "Unable to establish ubus connection")
 	end