popov/iot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better config implementation from ENV or json file.

Browse Source 
using new environment;
params passed as docker-compose params
This commit is contained in:
Dobromir Popov
2021-08-22 23:53:00 +03:00
parent 28ccaba895
commit 913b1a4f32
11 changed files with 11026 additions and 1264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/db/devicemessages.js
View File

@@ -1,5 +1,5 @@
//devicemessages
var mysql = require('mysql');
var mysql = require('mysql2');
// const fs = require('fs');
@@ -7,22 +7,24 @@ var mysql = require('mysql');
// const Sequelize = require('sequelize');
// const basename = path.basename(__filename);
const env = process.env.NODE_ENV || 'development';
console.log("ENV: %s", env);
const config = require(__dirname + '/../../config/config.json')[env];
console.log('DB: Checking config sources: ');
console.log('DB: Checking config sources: process.env.DATABASE_HOST: %s', process.env.DATABASE_HOST);
console.log('DB: Checking config sources: config.host : %s', config.host );
console.log('DB: Checking config sources: process.env.DATABASE_NAME: %s', process.env.DATABASE_NAME);
console.log('DB: Checking config sources: config.database : %s', config.database );
var pool = mysql.createPool({
connectionLimit : 20,
host : process.env.DATABASE_HOST || config.host || '127.0.0.1',
user : process.env.DATABASE_USER || config.username,
password : process.env.DATABASE_PASS || config.password,
database : process.env.DATABASE_DB || config.database
host : process.env.DATABASE_HOST || config.host || '127.0.0.1',
port : process.env.DATABASE_PORT || config.port || '3306',
user : process.env.DATABASE_USER || config.username,
password : process.env.DATABASE_PASS || config.password,
database : process.env.DATABASE_NAME || config.database || 'iot'
});
// var con = mysql.createConnection({
// host : 'localhost',
// user : 'iot',
// password : '!iot_popovi',
// database : 'iot'
// });
//const got = require('got');
pool.on('acquire', function (connection) {