jshbrmn/braid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added envs for cert so that we can set prod path for prod certs

Browse Source
This commit is contained in:
Josh Burman 2019-03-14 23:25:20 -04:00
parent 14d13e7cbb
commit 8875615867
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/app.ts
View File

@ -7,6 +7,8 @@ module.exports = {
hostname: process.env.HOSTNAME || 'ysbraid.localhost', hostname: process.env.HOSTNAME || 'ysbraid.localhost',
environment: process.env.ENVIRONMENT || 'development', environment: process.env.ENVIRONMENT || 'development',
log_level: process.env.LOG_LEVEL || 'debug', log_level: process.env.LOG_LEVEL || 'debug',
privateKey: process.env.PRIVATE_KEY || 'certs/key.pem',
certificate: process.env.CERTIFICATE || 'certs/cert.pem',
signOptions : { signOptions : {
issuer: 'Yardstick Software', issuer: 'Yardstick Software',
subject: 'Braid JWT', subject: 'Braid JWT',

2
src/logger.ts
View File

@ -19,7 +19,7 @@ function loggerTransports(logName: string, logLevel: string) {
const errorLog = createLogger({ const errorLog = createLogger({
format: logFormat, format: logFormat,
transports: loggerTransports('error', 'debug') transports: loggerTransports('errors', 'debug')
}); });
const accessLog = createLogger({ const accessLog = createLogger({

8
src/server.ts
View File

@ -15,8 +15,8 @@ import ChannelManager from './channelManager';
import ClientBase from './clients/clientBase'; import ClientBase from './clients/clientBase';
import MHSClient from './clients/sites/mhsClient'; import MHSClient from './clients/sites/mhsClient';
var privateKey = fs.readFileSync('certs/key.pem', 'utf8'); var privateKey = fs.readFileSync(app.privateKey, 'utf8');
var certificate = fs.readFileSync('certs/cert.pem', 'utf8'); var certificate = fs.readFileSync(app.certificate, 'utf8');
var options = {key: privateKey, cert: certificate, hostname: app.hostname}; var options = {key: privateKey, cert: certificate, hostname: app.hostname};
const application = express(); const application = express();
@ -29,7 +29,7 @@ application.use('', routes);
let clientManager = new ClientManager(); let clientManager = new ClientManager();
let channelManager = new ChannelManager(); let channelManager = new ChannelManager();
function connectionListener() { function connectionManager() {
wss.on('connection', (ws: WebSocket, request: object, args: string) => { wss.on('connection', (ws: WebSocket, request: object, args: string) => {
var data = JSON.parse(args).data var data = JSON.parse(args).data
logger.accessLog.info(`Client Connected: ${data.user_id}`); logger.accessLog.info(`Client Connected: ${data.user_id}`);
@ -101,7 +101,7 @@ function listenForConnection() {
} }
function startServer() { function startServer() {
connectionListener(); connectionManager();
serverUpgrade(); serverUpgrade();
listenForConnection(); listenForConnection();
} }