Merge pull request #6704 from janh/vnstat2-use-dbiflist

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

diff --git a/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js b/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js
index 10cd85641c0ee0aa174c3a0e34cf7722705c953b..4d4bfd0dbe1e94359c87665a0933c6259b59ad02 100644 (file)
--- a/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js
+++ b/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/config.js
@@ -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') || [];