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

luci-app-vnstat2: use more efficient way to get database interfaces

Browse source 
The currently used command "vnstat --json f 1" can be very slow when the
database contains many entries. This can result in an XHR timeout error
on the configuration page.

Use the "--dbiflist" option instead, which was added in vnStat 2.7.

Fixes: #6702
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
This commit is contained in:
Jan Hoffmann 2023-11-18 09:52:45 +01:00
parent 63d5e23963
commit 3ac4f567df
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js
View file

@ -58,13 +58,10 @@ return view.extend({
o = s.option(form.DummyValue, '_database');
o.load = function(section_id) {
return fs.exec('/usr/bin/vnstat', ['--json', 'f', '1']).then(L.bind(function(result) {
return fs.exec('/usr/bin/vnstat', ['--dbiflist', '1']).then(L.bind(function(result) {
var databaseInterfaces = [];
if (result.code == 0) {
var vnstatData = JSON.parse(result.stdout);
for (var i = 0; i < vnstatData.interfaces.length; i++) {
databaseInterfaces.push(vnstatData.interfaces[i].name);
}
databaseInterfaces = result.stdout.trim().split('\n');
}
var configInterfaces = uci.get_first('vnstat', 'vnstat', 'interface') || [];