MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-29 08:43:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2561 from nzalev/mysql/mariadb-ssl-support

Browse Source 
Improved connectionObject creation
This commit is contained in:
Ylian Saint-Hilaire 2021-04-29 22:41:18 -07:00 committed by GitHub
commit da64ad5cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db.js
View File

@ -443,15 +443,8 @@ module.exports.CreateDB = function (parent, func) {
var dbname = (connectinArgs.database != null) ? connectinArgs.database : 'meshcentral'; var dbname = (connectinArgs.database != null) ? connectinArgs.database : 'meshcentral';
// Including the db name in the connection obj will cause a connection failure if it does not exist // Including the db name in the connection obj will cause a connection failure if it does not exist
var connectionObject = { var connectionObject = Clone(connectinArgs);
'host': connectinArgs.host, delete connectionObject.database;
'port': connectinArgs.port,
'user': connectinArgs.user,
'password': connectinArgs.password,
'connectionLimit': null
};
if (connectinArgs.connectionLimit != null) connectionObject.connectionLimit = connectinArgs.connectionLimit;
if (parent.args.mariadb) { if (parent.args.mariadb) {
// Use MariaDB // Use MariaDB