Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Benjamin Toby
2024-01-18 16:46:15 +01:00
parent 0e95334ef7
commit 05ba95342c
4 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/engine/utils/dbHandler.js
+16 -12
View File
@@ -18,9 +18,10 @@
////////////////////////////////////////
////////////////////////////////////////
const fs = require("fs");
const mysql = require("mysql");
const parseDbResults = require("./parseDbResults");
const path = require("path");
const SSL_PATH = path.resolve(__dirname, "../../../ssl");
const connection = mysql.createConnection({
host: process.env.DSQL_HOST,
@@ -33,17 +34,20 @@ const connection = mysql.createConnection({
: undefined,
timeout: 5000,
ssl: {
ca: (() => {
try {
if (process.env.DSQL_SSL_CA_PATH) {
return fs.readFileSync(process.env.DSQL_SSL_CA_PATH);
}
return undefined;
} catch (error) {
return undefined;
}
})(),
ca: `${SSL_PATH}/ca-cert.pem`,
},
// ssl: {
// ca: (() => {
// try {
// if (process.env.DSQL_SSL_CA_PATH) {
// return fs.readFileSync(process.env.DSQL_SSL_CA_PATH);
// }
// return undefined;
// } catch (error) {
// return undefined;
// }
// })(),
// },
});
//////////////////////////////////////////////////////////////////////////////////
engine/engine/utils/noDatabaseDbHandler.js
+4 -12
View File
@@ -1,9 +1,10 @@
// @ts-check
const fs = require("fs");
const dbHandler = require("./dbHandler");
const mysql = require("mysql");
const endConnection = require("./endConnection");
const path = require("path");
const SSL_PATH = path.resolve(__dirname, "../../../ssl");
const connection = mysql.createConnection({
host: process.env.DSQL_HOST,
@@ -15,16 +16,7 @@ const connection = mysql.createConnection({
: undefined,
timeout: 5000,
ssl: {
ca: (() => {
try {
if (process.env.DSQL_SSL_CA_PATH) {
return fs.readFileSync(process.env.DSQL_SSL_CA_PATH);
}
return undefined;
} catch (error) {
return undefined;
}
})(),
ca: `${SSL_PATH}/ca-cert.pem`,
},
});