diff --git a/fems-api/src/models/ApiKey.js b/fems-api/src/models/ApiKey.js index a1ded56..2a07783 100644 --- a/fems-api/src/models/ApiKey.js +++ b/fems-api/src/models/ApiKey.js @@ -71,7 +71,7 @@ class ApiKey extends Model { { sequelize, modelName: "ApiKey", - tableName: "api_keys", + tableName: "api_key", timestamps: true, indexes: [ { diff --git a/fems-mqtt/data/mosquitto.db b/fems-mqtt/data/mosquitto.db index 145174a..568efef 100644 Binary files a/fems-mqtt/data/mosquitto.db and b/fems-mqtt/data/mosquitto.db differ diff --git a/fems-mqtt/data/passwd b/fems-mqtt/data/passwd index c08f4ca..d27905a 100644 --- a/fems-mqtt/data/passwd +++ b/fems-mqtt/data/passwd @@ -1,2 +1,2 @@ -fems:$7$101$q3QFZ5evPd43ePCI$Zx3ns8us3mWVa7mu1AcnjdQwNWW4ervIvYGxBOWvqLruISS0fw/1F6Pul1HxMXzlJuIVSpxAcyUTNBw5BXidOw== -nodered_user:$7$101$EKpRnHrJAJ+ZZhZ7$KAYnbifvvlJgL6mEYbZs0bCoK/PJR9jb3bhRxF6KOkeIeCYddJ1UikV7tEu7PqbPQVJ215BCEg9DfRxFN7QhbA== +fems:$7$101$Ach+k+7cDgannVqR$NmlplxX4UsCGcF4Z6zm+fGW+J4zGQO8n6qNLcXGVE8fxRTT9vpVrmYRRIA6uOOI6rrHzEn6MKNtxQRCZ1PpyfA== +nodered_user:$7$101$YtBaU4/sDUXIBCL5$G3aOkSmnpo2xTjtgPYo86YszNeYQlBhlnENG8AoYG/1zCQuVf8K318R7J9L6GZno6YjQ9BgSe7aNI9rDQPshoQ== diff --git a/fems-mqtt/log/mosquitto.log b/fems-mqtt/log/mosquitto.log index ea909f9..0a9582d 100755 --- a/fems-mqtt/log/mosquitto.log +++ b/fems-mqtt/log/mosquitto.log @@ -20092,3 +20092,22 @@ To fix this, use `chmod 0700 /mosquitto/config/passwd`. 1732631128: New connection from ::1:52958 on port 1883. 1732631128: New client connected from ::1:52958 as auto-4D2D363C-D504-BF71-21B3-4E1E43F9C7D1 (p2, c1, k60, u'fems'). 1732631128: Client auto-4D2D363C-D504-BF71-21B3-4E1E43F9C7D1 closed its connection. +1732631312: mosquitto version 2.0.20 starting +1732631312: Config loaded from /mosquitto/config/mosquitto.conf. +1732631312: Opening ipv4 listen socket on port 1883. +1732631312: Opening ipv6 listen socket on port 1883. +1732631312: mosquitto version 2.0.20 running +1732631316: New connection from 172.19.0.9:35042 on port 1883. +1732631316: New client connected from 172.19.0.9:35042 as fems_realtime_40 (p2, c1, k60, u'fems'). +1732631342: New connection from ::1:58338 on port 1883. +1732631342: New client connected from ::1:58338 as auto-3C8D79F2-96F3-41FB-7665-7A0159FB7C4C (p2, c1, k60, u'fems'). +1732631342: Client auto-3C8D79F2-96F3-41FB-7665-7A0159FB7C4C closed its connection. +1732631372: New connection from ::1:40554 on port 1883. +1732631372: New client connected from ::1:40554 as auto-5DCC2AC7-F7B0-CE96-1908-6AB2C21E52E6 (p2, c1, k60, u'fems'). +1732631372: Client auto-5DCC2AC7-F7B0-CE96-1908-6AB2C21E52E6 closed its connection. +1732631403: New connection from ::1:55066 on port 1883. +1732631403: New client connected from ::1:55066 as auto-C8742770-8514-2EB4-6C0E-005ED27D822A (p2, c1, k60, u'fems'). +1732631403: Client auto-C8742770-8514-2EB4-6C0E-005ED27D822A closed its connection. +1732631433: New connection from ::1:52128 on port 1883. +1732631433: New client connected from ::1:52128 as auto-F6A59FAC-5787-6DA2-E7F8-4BD6011999E7 (p2, c1, k60, u'fems'). +1732631433: Client auto-F6A59FAC-5787-6DA2-E7F8-4BD6011999E7 closed its connection. diff --git a/fems-realtime-api/logs/info/info-2024-11-26.log b/fems-realtime-api/logs/info/info-2024-11-26.log index c0176b3..d466d85 100644 --- a/fems-realtime-api/logs/info/info-2024-11-26.log +++ b/fems-realtime-api/logs/info/info-2024-11-26.log @@ -161,3 +161,11 @@ {"environment":"development","level":"info","message":"Connected to MQTT broker","service":"fems-edge","timestamp":"2024-11-26 22:55:27"} {"environment":"development","level":"info","message":"Realtime backend server running on port 3004","service":"fems-edge","timestamp":"2024-11-26 22:55:27"} {"environment":"development","level":"info","message":"Subscribed to data/+/+/+/#","service":"fems-edge","timestamp":"2024-11-26 22:55:27"} +{"environment":"development","error":"connect ECONNREFUSED 172.19.0.2:5433","level":"warn","message":"Failed to connect to services, attempt 1/30","service":"fems-edge","services":"{\"timescaledb\":false,\"redis\":false}","timestamp":"2024-11-26 23:28:33"} +{"environment":"development","level":"info","message":"Successfully connected to TimescaleDB","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"Successfully connected to Redis","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"All services are connected","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"broker":"mqtt://fems-mqtt:1883","clientId":"fems_realtime_40","environment":"development","level":"info","message":"Connecting to MQTT broker...","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"Connected to MQTT broker","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"Realtime backend server running on port 3004","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"Subscribed to data/+/+/+/#","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} diff --git a/fems-realtime-api/logs/system/system-2024-11-26.log b/fems-realtime-api/logs/system/system-2024-11-26.log index c0176b3..d466d85 100644 --- a/fems-realtime-api/logs/system/system-2024-11-26.log +++ b/fems-realtime-api/logs/system/system-2024-11-26.log @@ -161,3 +161,11 @@ {"environment":"development","level":"info","message":"Connected to MQTT broker","service":"fems-edge","timestamp":"2024-11-26 22:55:27"} {"environment":"development","level":"info","message":"Realtime backend server running on port 3004","service":"fems-edge","timestamp":"2024-11-26 22:55:27"} {"environment":"development","level":"info","message":"Subscribed to data/+/+/+/#","service":"fems-edge","timestamp":"2024-11-26 22:55:27"} +{"environment":"development","error":"connect ECONNREFUSED 172.19.0.2:5433","level":"warn","message":"Failed to connect to services, attempt 1/30","service":"fems-edge","services":"{\"timescaledb\":false,\"redis\":false}","timestamp":"2024-11-26 23:28:33"} +{"environment":"development","level":"info","message":"Successfully connected to TimescaleDB","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"Successfully connected to Redis","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"All services are connected","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"broker":"mqtt://fems-mqtt:1883","clientId":"fems_realtime_40","environment":"development","level":"info","message":"Connecting to MQTT broker...","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"Connected to MQTT broker","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"Realtime backend server running on port 3004","service":"fems-edge","timestamp":"2024-11-26 23:28:36"} +{"environment":"development","level":"info","message":"Subscribed to data/+/+/+/#","service":"fems-edge","timestamp":"2024-11-26 23:28:36"}