From a297cef17931523045e6d79cb30601a83736dda1 Mon Sep 17 00:00:00 2001 From: Terrtia Date: Tue, 10 Nov 2020 15:04:45 +0100 Subject: [PATCH] fic: [Sensors monitoring] fix reload list of sensors to monitor --- server/lib/Sensor.py | 1 + server/sensors_manager.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/lib/Sensor.py b/server/lib/Sensor.py index 526901b..0cad0ef 100755 --- a/server/lib/Sensor.py +++ b/server/lib/Sensor.py @@ -234,6 +234,7 @@ def add_sensor_to_monitor(sensor_uuid, delta_time): r_serv_db.sadd('to_monitor:sensors', sensor_uuid) r_serv_db.hset('to_monitor:sensor:{}'.format(sensor_uuid), 'delta_time', delta_time) r_serv_db.set('sensors_monitoring:last_updated', int(time.time())) + r_serv_db.srem('sensors_monitoring:sensors_error', sensor_uuid) def delete_sensor_to_monitor(sensor_uuid): r_serv_db.srem('to_monitor:sensors', sensor_uuid) diff --git a/server/sensors_manager.py b/server/sensors_manager.py index 5f51a83..102eabc 100755 --- a/server/sensors_manager.py +++ b/server/sensors_manager.py @@ -32,6 +32,7 @@ def reload_all_sensors_to_monitor_dict(dict_to_monitor, last_updated): dict_to_monitor = Sensor.get_all_sensors_to_monitor_dict() last_updated = int(time.time()) print('updated: List of sensors to monitor') + return dict_to_monitor if __name__ == "__main__": @@ -49,5 +50,5 @@ if __name__ == "__main__": curr_time = int(time.time()) if curr_time - time_refresh >= 60: time_refresh = curr_time - reload_all_sensors_to_monitor_dict(all_sensors_to_monitor, last_updated) + dict_to_monitor = reload_all_sensors_to_monitor_dict(all_sensors_to_monitor, last_updated) ##-- --##