blockdevices() catch errors adapted for just one line

2020-11-09 08:27:15 +01:00
parent 53e0e49b77
commit 932f962872
5 changed files with 19 additions and 14 deletions
@@ -268,8 +268,8 @@ function parseDevices(lines) {
 function parseBlk(lines) {
  let data = [];

-  try {
-    lines.filter(line => line !== '').forEach((line) => {
+  lines.filter(line => line !== '').forEach((line) => {
+    try {
      line = decodeURIComponent(line.replace(/\\x/g, '%'));
      line = line.replace(/\\/g, '\\\\');
      let disk = JSON.parse(line);
@@ -288,14 +288,13 @@ function parseBlk(lines) {
        'protocol': disk.tran,
        'group': disk.group,
      });
-    });
-    data = util.unique(data);
-    data = util.sortByKey(data, ['type', 'name']);
-    return data;
-  } catch (e) {
-    return [];
-  }
-
+    } catch (e) {
+      util.noop();
+    }
+  });
+  data = util.unique(data);
+  data = util.sortByKey(data, ['type', 'name']);
+  return data;
 }

 function blkStdoutToObject(stdout) {