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

better logging; fix mysql port misconfiguration

Browse Source
This commit is contained in:
Dobromir Popov ONE
2022-03-30 19:34:32 +03:00
parent a701761510
commit 10a7aa2fed
6 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.json
View File

@@ -4,7 +4,7 @@
"password": "!iot_popovi_nh", "password": "!iot_popovi_nh",
"database": "iot", "database": "iot",
"host": "192.168.0.10", "host": "192.168.0.10",
"port":"3304", "port":"3306",
"dialect": "mysql", "dialect": "mysql",
"operatorsAliases": false, "operatorsAliases": false,
"logFile":"/dht.log", "logFile":"/dht.log",

6
docker-compose.yml
View File

@@ -6,9 +6,9 @@ services:
environment: environment:
- DATABASE_HOST=node-mysql - DATABASE_HOST=node-mysql
- DATABASE_NAME=iot - DATABASE_NAME=iot
- DATABASE_USER=root - DATABASE_USER=iot
- DATABASE_PASS=mitko2021 - DATABASE_PASS=mitko2021
- GARDEN_IP=192.168.0.187 - GARDEN_IP=192.168.0.100
- MQTT_HOST=node-mqtt - MQTT_HOST=node-mqtt
- MQTT_PORT_HTTP=1883 - MQTT_PORT_HTTP=1883
- MQTT_PORT_HTTPS=8444 - MQTT_PORT_HTTPS=8444
@@ -23,7 +23,7 @@ services:
restart: always restart: always
environment: environment:
MYSQL_DATABASE: iot MYSQL_DATABASE: iot
MYSQL_ROOT_PASSWORD: mitko2021 MYSQL_ROOT_PASSWORD: mitko2022
MYSQL_USER: iot MYSQL_USER: iot
MYSQL_PASSWORD: mitko2021 MYSQL_PASSWORD: mitko2021
volumes: volumes:

6
docker-readme.md Normal file
View File

@@ -0,0 +1,6 @@
#to build and deploy in docker:
~/var/www/html/iot.d-popov.com#> docker-compose build
docker-compose up
# OR
cd /var/www/html/iot.d-popov.com
docker-compose up --build

2
mysql/Dockerfile
View File

@@ -1,6 +1,6 @@
FROM mysql FROM mysql
ENV MYSQL_DATABASE iot ENV MYSQL_DATABASE iot
ENV MYSQL_ROOT_PASSWORD mitko2021 ENV MYSQL_ROOT_PASSWORD mitko2022
COPY schema.sql /docker-entrypoint-initdb.d/ COPY schema.sql /docker-entrypoint-initdb.d/

5
readme.md
View File

@@ -1,5 +0,0 @@
to build and deploy in docker: run |
~/var/www/html/iot.d-popov.com#> docker-compose build
+ docker-compose up
+ OR
+ docker-compose up --build

16
src/db/devicemessages.js
View File

@@ -10,11 +10,17 @@ const env = process.env.NODE_ENV || 'development';
console.log("ENV: %s", env); console.log("ENV: %s", env);
const config = require(__dirname + '/../../config/config.json')[env]; const config = require(__dirname + '/../../config/config.json')[env];
console.log('DB: Checking config sources: '); console.log('DB: Checking config sources in devicemessages.js');
console.log('DB: Checking config sources: process.env.DATABASE_HOST: %s', process.env.DATABASE_HOST); 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: 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: process.env.DATABASE_PORT: %s', process.env.DATABASE_PORT);
console.log('DB: Checking config sources: config.database : %s', config.database ); console.log('DB: Checking config sources: config.port : %s', config.port );
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 );
console.log('DB: Checking config sources: process.env.DATABASE_USER: "%s"', process.env.DATABASE_USER);
console.log('DB: Checking config sources: config.username : "%s"', config.username );
// console.log('DB: Checking config sources: process.env.DATABASE_PASS: "%s"', process.env.DATABASE_PASS);
// console.log('DB: Checking config sources: config.password : "%s"', config.password );
var pool = mysql.createPool({ var pool = mysql.createPool({
connectionLimit : 20, connectionLimit : 20,