sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-10 16:00:05 +00:00
Code Issues Projects Releases Wiki Activity

fix: use env if provided for desktop mode

Browse Source
This commit is contained in:
Saad Jutt
2021-12-15 18:24:04 +05:00
parent e11a4b66e7
commit d19ce253b4
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/src/utils/connectDB.ts
View File

@@ -3,12 +3,14 @@ import mongoose from 'mongoose'
import { configuration } from '../../package.json'
import { getDesktopFields } from '.'
import { populateClients } from '../routes/api/auth'
import { getRealPath } from '@sasjs/utils'
export const connectDB = async () => {
// NOTE: when exporting app.js as agent for supertest
// we should exlcude connecting to the real database
if (process.env.NODE_ENV !== 'test') {
const { MODE } = process.env
if (MODE?.trim() !== 'server') {
console.log('Running in Destop Mode, no DB to connect.')
@@ -16,16 +18,19 @@ export const connectDB = async () => {
process.sasLoc = sasLoc
process.driveLoc = driveLoc
} else {
const { SAS_PATH, DRIVE_PATH } = process.env
return
process.sasLoc = SAS_PATH ?? configuration.sasPath
process.driveLoc = getRealPath(
path.join(process.cwd(), DRIVE_PATH ?? 'tmp')
)
}
const { SAS_PATH } = process.env
const sasDir = SAS_PATH ?? configuration.sasPath
process.sasLoc = path.join(sasDir, 'sas')
console.log('sasLoc: ', process.sasLoc)
console.log('sasDrive: ', process.driveLoc)
if (MODE?.trim() !== 'server') return
mongoose.connect(process.env.DB_CONNECT as string, async (err) => {
if (err) throw err