mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Validate if result exist outside error validation

Browse Source
This commit is contained in:
Maria Camila Cubides 2021-05-04 12:19:29 -05:00
parent f25bb4e25d
commit 377048de7c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/network.js
View File

@ -1503,26 +1503,26 @@ function networkGatewayDefault(callback) {
try { try {
exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) { exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
if (!error) { if (!error) {
let lines = stdout.toString().split('\n').map(line => line.trim()); const lines = stdout.toString().split('\n').map(line => line.trim());
result = util.getValue(lines, 'gateway'); result = util.getValue(lines, 'gateway');
if (!result) { }
cmd = 'netstat -rn | awk \'/default/ {print $2}\''; if (!result) {
exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) { cmd = 'netstat -rn | awk \'/default/ {print $2}\'';
lines = stdout.toString().split('\n').map(line => line.trim()); exec(cmd, { maxBuffer: 1024 * 20000 }, function (error, stdout) {
result = lines.find(line => (/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(line))); const lines = stdout.toString().split('\n').map(line => line.trim());
if (callback) { result = lines.find(line => (/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(line)));
callback(result);
}
resolve(result);
});
} else {
if (callback) { if (callback) {
callback(result); callback(result);
} }
resolve(result); resolve(result);
});
} else {
if (callback) {
callback(result);
} }
resolve(result);
} }
}); });
} catch (e) { } catch (e) {
if (callback) { callback(result); } if (callback) { callback(result); }
resolve(result); resolve(result);