diff --git a/actions/getproperties.js b/actions/getproperties.js index cdaa5e1..e3087eb 100644 --- a/actions/getproperties.js +++ b/actions/getproperties.js @@ -16,7 +16,7 @@ export const getOneProperty = async (params) => { } // read 'chip'-data (special for noise sensors) const chipdata = await readChipData(opts.sensorid) - if (chipdata.err == undefined) { + if (chipdata.err === null) { properties.chip = chipdata } let sensorEntries = []; diff --git a/bin/www.js b/bin/www.js index 21aa76b..98160d6 100644 --- a/bin/www.js +++ b/bin/www.js @@ -84,7 +84,6 @@ function onError(error) { */ function onListening() { - console.log('DEBUG:', process.env.DEBUG, process.env.INFLUXHOST) const addr = server.address(); const bind = typeof addr === 'string' ? 'pipe ' + addr diff --git a/databases/influx.js b/databases/influx.js index b63377d..94fa11d 100644 --- a/databases/influx.js +++ b/databases/influx.js @@ -163,4 +163,4 @@ peak = data ${small} ` return await fetchFromInflux(ret, queryAVG) -} \ No newline at end of file +} diff --git a/databases/mongo.js b/databases/mongo.js index ee9bcee..d4046b3 100644 --- a/databases/mongo.js +++ b/databases/mongo.js @@ -28,9 +28,9 @@ export const properties_collection = 'properties' export const connectMongo = async () => { try { - logit(`Try to connect to ${MONGO_URL}`) +// logit(`Try to connect to ${MONGO_URL}`) let client = await MongoClient.connect(MONGO_URL) - logit(`Mongodbase connected to ${MONGO_URL}`) +// logit(`Mongodbase connected to ${MONGO_URL}`) return client } catch(error){ @@ -55,7 +55,7 @@ export const readProperties = async (query, limit = 0) => { let client = await connectMongo() try { if ("sid" in query) { // if sid is given, read property for sid - ret.properties = await client.db(MONGOBASE).collection('properties_collection').findOne({_id: query.sid}) + ret.properties = await client.db(MONGOBASE).collection(properties_collection).findOne({_id: query.sid}) } else { // otherwise read props corresponding to query ret.properties = await client.db(MONGOBASE).collection(properties_collection).find(query).limit(limit).toArray() } diff --git a/package.json b/package.json index e4fc18f..f1e40c5 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,11 @@ { "name": "sensorapi", - "version": "1.4.1", + "version": "1.4.2", "date": "2023-11-29 16:00 UTC", "private": true, "scripts": { "start": "node ./bin/www.js >>/var/log/sensorapi.log 2>&1", + "dev": "node ./bin/www.js", "test": "mocha ./test/test.js" }, "type": "module",