RageStudio/comty
1
0
Fork 0
mirror of https://github.com/ragestudio/comty.git synced 2025-06-10 02:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

use getConnectionConfig

Browse Source
This commit is contained in:
srgooglo 2022-05-14 19:43:55 +02:00
parent 94400bbd53
commit c4d8d34b00
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/server/src/index.js
View File

@ -29,9 +29,14 @@ import jwt from "jsonwebtoken"
const ExtractJwt = require("passport-jwt").ExtractJwt const ExtractJwt = require("passport-jwt").ExtractJwt
const LocalStrategy = require("passport-local").Strategy const LocalStrategy = require("passport-local").Strategy
function parseConnectionString(obj) { function getConnectionConfig(obj) {
const { db_user, db_driver, db_name, db_pwd, db_hostname, db_port } = obj const { db_user, db_driver, db_name, db_pwd, db_hostname, db_port } = obj
return `${db_driver ?? "mongodb"}://${db_user ? `${db_user}` : ""}${db_pwd ? `:${db_pwd}` : ""}${db_user ? "@" : ""}${db_hostname ?? "localhost"}:${db_port ?? ""}/${db_name ?? ""}`
return [`${db_driver ?? "mongodb"}://${db_user ? `${db_user}` : ""}${db_pwd ? `:${db_pwd}` : ""}${db_user ? "@" : ""}${db_hostname ?? "localhost"}:${db_port ?? "27017"}/?authMechanism=DEFAULT`, {
dbName: db_name,
useNewUrlParser: true,
useUnifiedTopology: true,
}]
} }
class Server { class Server {
@ -104,12 +109,9 @@ class Server {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
console.log("🌐 Trying to connect to DB...") console.log("🌐 Trying to connect to DB...")
const dbUri = parseConnectionString(this.env) const dbConfig = getConnectionConfig(this.env)
//console.log(dbUri) console.log(dbConfig)
mongoose.connect(dbUri, { mongoose.connect(...dbConfig)
useNewUrlParser: true,
useUnifiedTopology: true
})
.then((res) => { return resolve(true) }) .then((res) => { return resolve(true) })
.catch((err) => { return reject(err) }) .catch((err) => { return reject(err) })
} catch (err) { } catch (err) {

18
packages/streaming-server/src/managers/DbManager/index.js
View File

@ -1,8 +1,13 @@
import mongoose from "mongoose" import mongoose from "mongoose"
function parseConnectionString(obj) { function getConnectionConfig(obj) {
const { db_user, db_driver, db_name, db_pwd, db_hostname, db_port } = obj const { db_user, db_driver, db_name, db_pwd, db_hostname, db_port } = obj
return `${db_driver ?? "mongodb"}://${db_user ? `${db_user}` : ""}${db_pwd ? `:${db_pwd}` : ""}${db_user ? "@" : ""}${db_hostname ?? "localhost"}:${db_port ?? ""}/${db_name ?? ""}`
return [`${db_driver ?? "mongodb"}://${db_user ? `${db_user}` : ""}${db_pwd ? `:${db_pwd}` : ""}${db_user ? "@" : ""}${db_hostname ?? "localhost"}:${db_port ?? "27017"}/?authMechanism=DEFAULT`, {
dbName: db_name,
useNewUrlParser: true,
useUnifiedTopology: true,
}]
} }
export default class DBManager { export default class DBManager {
@ -14,14 +19,9 @@ export default class DBManager {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
console.log("🌐 Trying to connect to DB...") console.log("🌐 Trying to connect to DB...")
const dbUri = parseConnectionString(this.env) const dbConfig = getConnectionConfig(this.env)
//console.log(dbUri) mongoose.connect(...dbConfig)
mongoose.connect(dbUri, {
useNewUrlParser: true,
useUnifiedTopology: true
})
.then((res) => { return resolve(true) }) .then((res) => { return resolve(true) })
.catch((err) => { return reject(err) }) .catch((err) => { return reject(err) })
} catch (err) { } catch (err) {