docker/node-bulletin-board
1
0
Fork 0
mirror of https://github.com/docker-training/node-bulletin-board.git synced 2025-12-15 15:26:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add logging & config; update base images

Browse Source
This commit is contained in:
Elton Stoneman
2019-04-06 21:08:10 +01:00
parent cdf9a12c62
commit 68b8cd014c
15 changed files with 153 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bulletin-board-app/backend/api.js
View File

@@ -1,20 +1,21 @@
var db = require('./db.js');
var db = require('./db');
var log = require('../log');
exports.events = function (req, res) {
console.log('Loading DB events...');
log.Logger.info('Loading DB events...');
db.Events
.findAll()
.then(events => {
console.log('Fetched events, count: ' + events.length);
log.Logger.debug('Fetched events, count: ' + events.length);
res.json(events);
})
.catch(err => {
console.error('** Fetch failed: ', err);
log.Logger.error('** Fetch failed: ', err);
});
};
exports.event = function (req, res) {
console.log('Handling event call, method: ' + req.method + ', event ID: ' + req.params.eventId)
log.Logger.debug('Handling event call, method: ' + req.method + ', event ID: ' + req.params.eventId)
switch(req.method) {
case "DELETE":
db.Events
@@ -23,7 +24,7 @@ exports.event = function (req, res) {
id: req.params.eventId
}
}).then(function() {
console.log('Deleted event with id: ' + req.params.eventId)
log.Logger.info('Deleted event with id: ' + req.params.eventId)
res.status(200).end();
});
break
@@ -35,6 +36,7 @@ exports.event = function (req, res) {
date: req.body.date
})
.then(function() {
log.Logger.info('Created event with title: ' + req.body.title)
res.send('{}');
res.status(201).end();
});

16
bulletin-board-app/backend/db.js
View File

@@ -1,13 +1,11 @@
var Sequelize = require('sequelize');
var username = 'sa';
var password = 'DockerCon!!!';
var host = 'bb-db';
var dbName = 'BulletinBoard';
var dbConfig = require('../config/dbConfig');
var log = require('../log');
var sequelize = new Sequelize(dbName, username, password, {
var sequelize = new Sequelize(dbConfig.options.dbName, dbConfig.options.username, dbConfig.options.password, {
dialect: 'mssql',
host: host,
port: 1433,
host: dbConfig.options.host,
port: dbConfig.options.port,
dialectOptions: {
requestTimeout: 30000
}
@@ -16,10 +14,10 @@ var sequelize = new Sequelize(dbName, username, password, {
sequelize
.authenticate()
.then(() => {
console.log('Successful connection to SQL Server.');
log.Logger.info('Successful connection to SQL Server.');
})
.catch(err => {
console.error('** SQL Server connection failed: ', err);
log.Logger.error('** SQL Server connection failed: ', err);
process.exit(1);
});