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

luci-base: rpc.js: increase default timeout to 20s, allow batch prevention

Browse source 
Support a new option "nobatch: true" in rpc.declare() which prevents the
underlying RPC call from being batched with other calls.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-09-21 10:21:15 +02:00
parent afeacdc7df
commit 21d1266c53
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/luci-base/htdocs/luci-static/resources/rpc.js
View file

@ -6,7 +6,7 @@ var rpcRequestID = 1,
rpcInterceptorFns = []; rpcInterceptorFns = [];
return L.Class.extend({ return L.Class.extend({
call: function(req, cb) { call: function(req, cb, nobatch) {
var q = ''; var q = '';
if (Array.isArray(req)) { if (Array.isArray(req)) {
@ -26,7 +26,8 @@ return L.Class.extend({
} }
return L.Request.post(rpcBaseURL + q, req, { return L.Request.post(rpcBaseURL + q, req, {
timeout: (L.env.rpctimeout || 5) * 1000, timeout: (L.env.rpctimeout || 20) * 1000,
nobatch: nobatch,
credentials: true credentials: true
}).then(cb, cb); }).then(cb, cb);
}, },
@ -167,7 +168,7 @@ return L.Class.extend({
}; };
/* call rpc */ /* call rpc */
rpc.call(msg, rpc.parseCallReply.bind(rpc, req)); rpc.call(msg, rpc.parseCallReply.bind(rpc, req), options.nobatch);
}); });
}, this, this, options); }, this, this, options);
}, },