fix: use medusa config for env vars

This commit is contained in:
Sebastian Rindom committed 2020-09-01 11:57:09 +02:00
1 parent 1eb0f98a23
commit 61dc478084
2 files changed
+11 -7

No files matched your search

+9 -4
View File
@@ -1,5 +1,6 @@
import { createContainer, asValue } from "awilix" import { createContainer, asValue } from "awilix"
import Redis from "ioredis" import Redis from "ioredis"
import { getConfigFile } from "medusa-core-utils"
import expressLoader from "./express" import expressLoader from "./express"
import mongooseLoader from "./mongoose" import mongooseLoader from "./mongoose"
@@ -11,9 +12,13 @@ import passportLoader from "./passport"
import pluginsLoader from "./plugins" import pluginsLoader from "./plugins"
import defaultsLoader from "./defaults" import defaultsLoader from "./defaults"
import Logger from "./logger" import Logger from "./logger"
import config from "../config"
export default async ({ directory: rootDirectory, expressApp }) => { export default async ({ directory: rootDirectory, expressApp }) => {
const { configModule, configFilePath } = getConfigFile(
rootDirectory,
`medusa-config`
)
const container = createContainer() const container = createContainer()
container.registerAdd = function(name, registration) { container.registerAdd = function(name, registration) {
let storeKey = name + "_STORE" let storeKey = name + "_STORE"
@@ -32,8 +37,8 @@ export default async ({ directory: rootDirectory, expressApp }) => {
}.bind(container) }.bind(container)
// Economical way of dealing with redis clients // Economical way of dealing with redis clients
const client = new Redis(config.redisURI) const client = new Redis(configModule.projectConfig.redis_url)
const subscriber = new Redis(config.redisURI) const subscriber = new Redis(configModule.projectConfig.redis_url)
container.register({ container.register({
redisClient: asValue(client), redisClient: asValue(client),
@@ -50,7 +55,7 @@ export default async ({ directory: rootDirectory, expressApp }) => {
await subscribersLoader({ container }) await subscribersLoader({ container })
Logger.info("Subscribers initialized") Logger.info("Subscribers initialized")
const dbConnection = await mongooseLoader({ container }) const dbConnection = await mongooseLoader({ container, configModule })
Logger.info("MongoDB Intialized") Logger.info("MongoDB Intialized")
await expressLoader({ app: expressApp }) await expressLoader({ app: expressApp })
+2 -3
View File
@@ -1,7 +1,6 @@
import mongoose from "mongoose" import mongoose from "mongoose"
import config from "../config"
export default async ({ container }) => { export default async ({ container, configModule }) => {
const logger = container.resolve("logger") const logger = container.resolve("logger")
mongoose.connection.on("error", err => { mongoose.connection.on("error", err => {
@@ -9,7 +8,7 @@ export default async ({ container }) => {
}) })
return mongoose return mongoose
.connect(config.databaseURL, { .connect(configModule.projectConfig.mongo_url, {
useNewUrlParser: true, useNewUrlParser: true,
useCreateIndex: true, useCreateIndex: true,
useUnifiedTopology: true, useUnifiedTopology: true,