Enabling test server and bug fixes

This commit is contained in:
John Lyon-Smith
2018-04-20 17:40:55 -07:00
parent acfbc52cf9
commit f7c73ee277
15 changed files with 399 additions and 126 deletions

View File

@@ -1,19 +1,20 @@
import config from 'config'
import pino from 'pino'
import * as pinoExpress from 'pino-pretty-express'
import { DB } from '../database'
import { MS } from '../message-service'
import { ImageHandlers } from './ImageHandlers'
import path from 'path'
import fs from 'fs'
import config from "config"
import pino from "pino"
import * as pinoExpress from "pino-pretty-express"
import { DB } from "../database"
import { MS } from "../message-service"
import { ImageHandlers } from "./ImageHandlers"
import path from "path"
import fs from "fs"
const serviceName = 'dar-image'
const isProduction = (process.env.NODE_ENV == 'production')
const serviceName = config.get("serviceName.image")
const isProduction = process.env.NODE_ENV === "production"
let log = null
if (isProduction) {
log = pino( { name: serviceName },
fs.createWriteStream(path.join(config.get('logDir'), serviceName + '.log'))
log = pino(
{ name: serviceName },
fs.createWriteStream(path.join(config.get("logDir"), serviceName + ".log"))
)
} else {
const pretty = pinoExpress.pretty({})
@@ -24,22 +25,21 @@ if (isProduction) {
const ms = new MS(serviceName, { durable: false }, log)
const db = new DB()
let container = { db, ms, log }
const mongoUri = config.get('uri.mongo')
const amqpUri = config.get('uri.amqp')
const mongoUri = config.get("uri.mongo")
const amqpUri = config.get("uri.amqp")
Promise.all([
db.connect(mongoUri),
ms.connect(amqpUri)
]).then(() => {
log.info(`Connected to MongoDB at ${mongoUri}`)
log.info(`Connected to RabbitMQ at ${amqpUri}`)
Promise.all([db.connect(mongoUri), ms.connect(amqpUri)])
.then(() => {
log.info(`Connected to MongoDB at ${mongoUri}`)
log.info(`Connected to RabbitMQ at ${amqpUri}`)
container = {
...container,
handlers: new ImageHandlers(container)
}
container = {
...container,
handlers: new ImageHandlers(container),
}
ms.listen(container.handlers)
}).catch((err) => {
log.error(isProduction ? err.message : err)
})
ms.listen(container.handlers)
})
.catch((err) => {
log.error(isProduction ? err.message : err)
})