Fixed server crash due to assigning a const.
Ylian Saint-Hilaire committed
Mar 31, 2020 at 10:37 UTC
6c4f1ec2b550532b4958333f8b914d8e100e52ef
2 files changed
+3
-4
meshuser.js
+2
-3
@@ -857,13 +857,12 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
857
info.dbType = ['None', 'NeDB', 'MongoJS', 'MongoDB'][parent.db.databaseType];
858
if (parent.db.databaseType == 3) { info.dbChangeStream = parent.db.changeStream; }
859
if (parent.parent.pluginHandler != null) { info.plugins = []; for (var i in parent.parent.pluginHandler.plugins) { info.plugins.push(i); } }
860
- try { info.nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]); } catch (ex) { }
861
- try { info.currentVer = parent.parent.currentVer; } catch (ex) { }
860
+ try { info.nodeVersion = process.version; } catch (ex) { }
861
+ try { info.meshVersion = parent.parent.currentVer; } catch (ex) { }
862
try { info.platform = process.platform; } catch (ex) { }
863
try { info.arch = process.arch; } catch (ex) { }
864
try { info.pid = process.pid; } catch (ex) { }
865
try { info.uptime = process.uptime(); } catch (ex) { }
866
- try { info.version = process.version; } catch (ex) { }
866
try { info.cpuUsage = process.cpuUsage(); } catch (ex) { }
867
try { info.warnings = parent.parent.getServerWarnings(); } catch (ex) { }
868
try { info.database = ["Unknown", "NeDB", "MongoJS", "MongoDB", "MariaDB", "MySQL"][parent.parent.db.databaseType]; } catch (ex) { }
webserver.js
+1
-1
@@ -3238,7 +3238,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
3238
3239
// Handle a request to download a mesh agent
3240
obj.handleMeshAgentRequest = function (req, res) {
3241
- const domain = getDomain(req, res);
3241
+ var domain = getDomain(req, res);
3242
if (domain == null) { parent.debug('web', 'handleRootRequest: invalid domain.'); try { res.sendStatus(404); } catch (ex) { } return; }
3243
3244
// If required, check if this user has rights to do this