From 10a7aa2fedd171c1615b33169ebf0063c0342a0a Mon Sep 17 00:00:00 2001 From: Dobromir Popov ONE Date: Wed, 30 Mar 2022 19:34:32 +0300 Subject: [PATCH] better logging; fix mysql port misconfiguration --- config/config.json | 2 +- docker-compose.yml | 6 +++--- docker-readme.md | 6 ++++++ mysql/Dockerfile | 2 +- readme.md | 5 ----- src/db/devicemessages.js | 16 +++++++++++----- 6 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 docker-readme.md delete mode 100644 readme.md diff --git a/config/config.json b/config/config.json index 3db6c3d..99310a2 100644 --- a/config/config.json +++ b/config/config.json @@ -4,7 +4,7 @@ "password": "!iot_popovi_nh", "database": "iot", "host": "192.168.0.10", - "port":"3304", + "port":"3306", "dialect": "mysql", "operatorsAliases": false, "logFile":"/dht.log", diff --git a/docker-compose.yml b/docker-compose.yml index 381a127..348654e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,9 +6,9 @@ services: environment: - DATABASE_HOST=node-mysql - DATABASE_NAME=iot - - DATABASE_USER=root + - DATABASE_USER=iot - DATABASE_PASS=mitko2021 - - GARDEN_IP=192.168.0.187 + - GARDEN_IP=192.168.0.100 - MQTT_HOST=node-mqtt - MQTT_PORT_HTTP=1883 - MQTT_PORT_HTTPS=8444 @@ -23,7 +23,7 @@ services: restart: always environment: MYSQL_DATABASE: iot - MYSQL_ROOT_PASSWORD: mitko2021 + MYSQL_ROOT_PASSWORD: mitko2022 MYSQL_USER: iot MYSQL_PASSWORD: mitko2021 volumes: diff --git a/docker-readme.md b/docker-readme.md new file mode 100644 index 0000000..a1652e1 --- /dev/null +++ b/docker-readme.md @@ -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 \ No newline at end of file diff --git a/mysql/Dockerfile b/mysql/Dockerfile index 89158c0..4e448ac 100644 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -1,6 +1,6 @@ FROM mysql ENV MYSQL_DATABASE iot -ENV MYSQL_ROOT_PASSWORD mitko2021 +ENV MYSQL_ROOT_PASSWORD mitko2022 COPY schema.sql /docker-entrypoint-initdb.d/ \ No newline at end of file diff --git a/readme.md b/readme.md deleted file mode 100644 index 0530123..0000000 --- a/readme.md +++ /dev/null @@ -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 \ No newline at end of file diff --git a/src/db/devicemessages.js b/src/db/devicemessages.js index 7f6ada8..0fa7fda 100644 --- a/src/db/devicemessages.js +++ b/src/db/devicemessages.js @@ -10,11 +10,17 @@ 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 ); +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: config.host : "%s"', config.host ); +console.log('DB: Checking config sources: process.env.DATABASE_PORT: %s', process.env.DATABASE_PORT); +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({ connectionLimit : 20,