Add logging & db config

bb-stack-final.yaml

@@ -0,0 +1,48 @@
+version: '3.7'
+
+services:
+  bb-db:
+    image: ${dockerId}/bb-db:v3
+    build:
+      context: ./bulletin-board-db
+    networks:
+      - bb-net
+    volumes:
+      - sqlbackup:/var/opt/mssql
+
+  bb-app:
+    image: ${dockerId}/bb-app:v3.3
+    build:
+      context: ./bulletin-board-app
+      dockerfile: Dockerfile.v3.3
+    networks:
+      - bb-net
+    configs:
+      - source: logConfig
+        target: /app/config/logConfig.js
+    secrets:
+      - source: dbConfig
+        target: /app/config/dbConfig.js
+
+  bb-proxy:
+    image: ${dockerId}/bb-proxy:v3
+    build:
+      context: ./bulletin-board-proxy
+    ports:
+      - "80:80"
+    networks:
+      - bb-net
+
+networks:
+  bb-net:
+
+volumes:
+  sqlbackup:
+
+configs:
+  logConfig:
+    external: true
+
+secrets:
+  dbConfig:
+    external: true

bulletin-board-app/backend/db.js

@@ -2,10 +2,15 @@ var Sequelize = require('sequelize');
 var dbConfig = require('../config/dbConfig');
 var log = require('../log');
 
-var sequelize = new Sequelize(dbConfig.options.dbName, dbConfig.options.username, dbConfig.options.password, {
+log.Logger.debug('Initializing connection to SQL Server: %s', dbConfig.connection.host);
+
+var sequelize = new Sequelize(dbConfig.connection.dbName, dbConfig.connection.username, dbConfig.connection.password, {
     dialect: 'mssql',
-    host: dbConfig.options.host,
+    host: dbConfig.connection.host,
-    port: dbConfig.options.port,
+    port: dbConfig.connection.port,
+    pool: {
+        max: dbConfig.pool.max
+    },
     dialectOptions: {
         requestTimeout: 30000
     }    
@@ -14,7 +19,8 @@ var sequelize = new Sequelize(dbConfig.options.dbName, dbConfig.options.username
 sequelize
     .authenticate()
     .then(() => {
-        log.Logger.info('Successful connection to SQL Server.');
+        log.Logger.info('Successful connection to SQL Server: %s', dbConfig.connection.host);
+        log.Logger.info('--Using connection pool max: %d', dbConfig.pool.max)
     })
     .catch(err => {
         log.Logger.error('** SQL Server connection failed: ', err);

bulletin-board-app/config/dbConfig.js

@@ -1,9 +1,13 @@
 var dbConfig = module.exports = {};
 
-dbConfig.options = {
+dbConfig.connection = {
     username: 'sa',
     password: 'DockerCon!!!',
     host: 'bb-db',
     post: 1433,
     dbName: 'BulletinBoard'
 };
+
+dbConfig.pool = {
+    max: 10
+};

bulletin-board-app/config/logConfig.js

@@ -1,10 +1,14 @@
-const winston = require('winston');
+const { format, transports } = require('winston');
 var logConfig = module.exports = {};
 
 logConfig.options = {
+    format: format.combine(
+        format.splat(),
+        format.simple()
+    ),
     transports: [
-        new winston.transports.Console({
+        new transports.Console({
-            level: 'info'
+            level: 'debug'
         })
     ]
 };