From 8875615867a57bb8e14a306de5114d98458a511c Mon Sep 17 00:00:00 2001
From: Josh Burman <josh.burman@getyardstick.com>
Date: Thu, 14 Mar 2019 23:25:20 -0400
Subject: [PATCH] added envs for cert so that we can set prod path for prod
 certs

---
 src/config/app.ts | 2 ++
 src/logger.ts     | 2 +-
 src/server.ts     | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/config/app.ts b/src/config/app.ts
index 753730c..020ff63 100644
--- a/src/config/app.ts
+++ b/src/config/app.ts
@@ -7,6 +7,8 @@ module.exports = {
   hostname: process.env.HOSTNAME || 'ysbraid.localhost',
   environment: process.env.ENVIRONMENT || 'development',
   log_level: process.env.LOG_LEVEL || 'debug',
+  privateKey: process.env.PRIVATE_KEY || 'certs/key.pem',
+  certificate: process.env.CERTIFICATE || 'certs/cert.pem',
   signOptions : {
     issuer:  'Yardstick Software',
     subject:  'Braid JWT',
diff --git a/src/logger.ts b/src/logger.ts
index 1776bf8..ea88a0e 100644
--- a/src/logger.ts
+++ b/src/logger.ts
@@ -19,7 +19,7 @@ function loggerTransports(logName: string, logLevel: string) {
 
 const errorLog = createLogger({
   format: logFormat,
-  transports: loggerTransports('error', 'debug')
+  transports: loggerTransports('errors', 'debug')
 });
 
 const accessLog = createLogger({
diff --git a/src/server.ts b/src/server.ts
index 8a4d89d..18bd684 100755
--- a/src/server.ts
+++ b/src/server.ts
@@ -15,8 +15,8 @@ import ChannelManager from './channelManager';
 import ClientBase from './clients/clientBase';
 import MHSClient from './clients/sites/mhsClient';
 
-var privateKey  = fs.readFileSync('certs/key.pem', 'utf8');
-var certificate = fs.readFileSync('certs/cert.pem', 'utf8');
+var privateKey  = fs.readFileSync(app.privateKey, 'utf8');
+var certificate = fs.readFileSync(app.certificate, 'utf8');
 var options = {key: privateKey, cert: certificate, hostname: app.hostname};
 
 const application = express();
@@ -29,7 +29,7 @@ application.use('', routes);
 let clientManager = new ClientManager();
 let channelManager = new ChannelManager();
 
-function connectionListener() {
+function connectionManager() {
   wss.on('connection', (ws: WebSocket, request: object, args: string) => {
     var data = JSON.parse(args).data
     logger.accessLog.info(`Client Connected: ${data.user_id}`);
@@ -101,7 +101,7 @@ function listenForConnection() {
 }
 
 function startServer() {
-  connectionListener();
+  connectionManager();
   serverUpgrade();
   listenForConnection();
 }