diff --git a/docs/Readme.md b/docs/Readme.md new file mode 100644 index 0000000..7c94011 --- /dev/null +++ b/docs/Readme.md @@ -0,0 +1,6 @@ +# Installation der Container +rxf 2023-10-25 +#### Dateien +#### Aufrufe + + diff --git a/influx_post.js b/influx_post.js index b63b431..938b22f 100644 --- a/influx_post.js +++ b/influx_post.js @@ -5,11 +5,11 @@ import { logit, logerror } from './logit.js' import { DateTime } from 'luxon' import { statistics } from'./readdata.js' +let DEVELOP = process.env.DEVELOP || 'false' let INFLUXHOST = process.env.INFLUXHOST || "localhost" let INFLUXPORT = process.env.INFLUXPORT || 8086 -let INFLUXTOKEN = process.env.INFLUXTOKEN || - "xuxTjvV7L3Mlr9diG36gMxExP_SbFntuJkp9KYj2_Hnz5U9zbCo7wurdkQqDtKO0Zchr6wbS8kGNW1L5I2V9YQ==" +let INFLUXTOKEN = process.env.INFLUXTOKEN || 'empty' let INFLUXDATABUCKET = process.env.INFLUXDATABUCKET || "sensor_data" let INFLUXORG = process.env.INFLUXORG || "citysensor" @@ -46,7 +46,10 @@ export const influxRead = async (query) => { export const influxWrite = async (data) => { let start = DateTime.now() let ret - // logit(INFLUXURL_WRITE) + logit(INFLUXURL_WRITE) + if (DEVELOP === 'true') { + logit(`Token: ${INFLUXTOKEN}`) + } try { ret = await axios({ method: 'post', diff --git a/mongo.js b/mongo.js index 4175b89..6da26ce 100644 --- a/mongo.js +++ b/mongo.js @@ -5,7 +5,7 @@ import { logit, logerror } from './logit.js' import { statistics } from './readdata.js' import { DateTime } from 'luxon' -// const nodemailer = require('nodemailer'); +let DEVELOP = process.env.DEVELOP || 'false' let MONGOHOST = process.env.MONGOHOST || 'localhost' let MONGOPORT = process.env.MONGOPORT || 27017 @@ -16,10 +16,10 @@ let MONGOBASE = process.env.MONGOBASE || 'allsensors' let MONGO_URL = 'mongodb://' + MONGOHOST + ':' + MONGOPORT; // URL to mongo database if (MONGOAUTH == 'true') { - MONGO_URL = 'mongodb://' + MONGOUSRP + '@' + MONGOHOST + ':' + MONGOPORT + '/?authSource=' + MONGOBASE; // URL to mongo database + MONGO_URL = 'mongodb://' + MONGOUSRP + '@' + MONGOHOST + ':' + MONGOPORT + '/?authSource=admin'; // URL to mongo database } -export const property_coll = 'pptest' +export const property_coll = 'properties' const addandshowstatistics = (client, text, field, start) => { statistics[field] = DateTime.now().diff(start, ['seconds']).toObject().seconds @@ -28,9 +28,17 @@ const addandshowstatistics = (client, text, field, start) => { export const connectMongo = async () => { try { - logit(`Try to connect to ${MONGO_URL}`) + if(DEVELOP === 'true') { + logit(`Try to connect to ${MONGO_URL}`) + } else { + logit(`Try to connect to ${'mongodb://' + MONGOHOST + ':' + MONGOPORT}`) + } let client = await MongoClient.connect(MONGO_URL, { useNewUrlParser: true, useUnifiedTopology: true }) - logit(`Mongodbase connected to ${MONGO_URL}`) + if ( DEVELOP === 'true') { + logit(`Mongodbase connected to ${MONGO_URL}`) + } else { + logit('Mongodbase connected') + } return client } catch (error) { diff --git a/readdata.js b/readdata.js index 87442a5..46c4692 100644 --- a/readdata.js +++ b/readdata.js @@ -3,16 +3,16 @@ import * as fs from 'fs' import { logit, logerror} from'./logit.js' import { DateTime } from 'luxon' const API_URL = 'https://api.sensor.community/static/v1/data.json'; // URL to API on 'luftdaten.info' -const SAVE_NAME = 'data/aktdata.json'; // filename for actual data +const SAVE_NAME = '/data/aktdata.json'; // filename for actual data -let LIVE = (process.env.LIVE == "true") || true +let LIVE = process.env.LIVE || 'true' export let statistics = {}; export const doReadfromAPI = async () => { logit(`LIVE = ${LIVE}`) let start = DateTime.now() let data = [] - if (LIVE) { + if (LIVE === 'true') { logit(`Start Reading from API`) let body for(let count = 1; count <= 3; count++) {