Merge pull request #3 from industrial-edge/BugFix-InfluxDB-error

Integration of wait function in data collector to wait for influxdb to be ready

.gitignore

@@ -0,0 +1 @@
+src/data-collector/node_modules/*

docker-compose.yml

@@ -5,7 +5,7 @@ services:
   datacollector:
     build:
       context: ./src/data-collector
-    image: data-collector_edge:0.0.1
+    image: data-collector_edge:0.0.2
     restart: always
     networks:
       - proxy-redirect

src/data-collector/.dockerignore

@@ -0,0 +1 @@
+node_modules

src/data-collector/Dockerfile

@@ -1,14 +1,18 @@
-#start with a nodejs base-image
+# start with a nodejs base-image
 FROM node:12.18.3-alpine
 
+# Create app directory
 WORKDIR /usr/src/app
 
-#install required nodejs packages
-RUN npm install influx
-RUN npm install mqtt
+# Install app dependencies
+COPY package*.json ./
 
-#copy the nodejs script into the container
+RUN npm install --production
+
+# Bundle app source
 COPY . .
 
+EXPOSE 3000
+
 #set start command for container
 CMD [ "node", "app.js" ]

src/data-collector/app.js

@@ -64,6 +64,29 @@ const influx = new Influx.InfluxDB({
   ]
 })
 
+
+const delay = ms => new Promise(res => setTimeout(res, ms));
+
+createDatabase = async (influx, influxdbDatabase) => {
+  i = 0
+  do {
+    await delay(5000);
+    hosts = await influx.ping(5000)
+    console.log(hosts)
+    i++;
+    console.log(`Try to connect to InfluxDB: try number ${i}`)
+    console.log(`influxdb Status: ${hosts[0].online}`)
+  } while (!hosts[0].online)
+  console.log("Influx DB online");
+  influx.createDatabase(influxdbDatabase)
+} 
+
+createDatabase(influx, INFLUXDB_DATABASE).then(res => {
+  console.log("Database created");
+})
+
+
+/*
 //create database
 function createDatabase() {
   influx.createDatabase(INFLUXDB_DATABASE)
@@ -72,6 +95,7 @@ function createDatabase() {
 
 //wait 12 seconds before creating database (influx container needs a while to initialize)
 setTimeout(createDatabase, 12000);
+*/
 
 /* Publish response after recieved message*/
 client.on('message', function (topic, message) {