friso/rpi-mqtt-monitor
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #66 from hjelev/dev

Browse Source 
fix a bug in update due to separation
This commit is contained in:
Masoko
2024-02-02 00:32:38 +02:00
committed by GitHub
parent e334be3dbf 01c62a5e9a
commit 083783a928
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/rpi-cpu2mqtt.py
View File

@@ -517,7 +517,7 @@ def collect_monitored_values():
def gather_and_send_info(): def gather_and_send_info():
while True: while not stop_event.is_set():
cpu_load, cpu_temp, used_space, voltage, sys_clock_speed, swap, memory, uptime_days, uptime_seconds, wifi_signal, wifi_signal_dbm, rpi5_fan_speed, git_update = collect_monitored_values() cpu_load, cpu_temp, used_space, voltage, sys_clock_speed, swap, memory, uptime_days, uptime_seconds, wifi_signal, wifi_signal_dbm, rpi5_fan_speed, git_update = collect_monitored_values()
if hasattr(config, 'random_delay'): if hasattr(config, 'random_delay'):
@@ -533,16 +533,21 @@ def gather_and_send_info():
if not args.service: if not args.service:
break break
# Break the sleep into 1-second intervals and check stop_event after each interval
time.sleep(config.service_sleep_time) for _ in range(config.service_sleep_time):
if stop_event.is_set():
break
time.sleep(1)
def update_status(): def update_status():
while True: while not stop_event.is_set():
cpu_load, cpu_temp, used_space, voltage, sys_clock_speed, swap, memory, uptime_days, uptime_seconds, wifi_signal, wifi_signal_dbm, rpi5_fan_speed, git_update = collect_monitored_values() cpu_load, cpu_temp, used_space, voltage, sys_clock_speed, swap, memory, uptime_days, uptime_seconds, wifi_signal, wifi_signal_dbm, rpi5_fan_speed, git_update = collect_monitored_values()
publish_to_mqtt(cpu_load, cpu_temp, used_space, voltage, sys_clock_speed, swap, memory, uptime_days, uptime_seconds, wifi_signal, wifi_signal_dbm, rpi5_fan_speed, git_update) publish_to_mqtt(cpu_load, cpu_temp, used_space, voltage, sys_clock_speed, swap, memory, uptime_days, uptime_seconds, wifi_signal, wifi_signal_dbm, rpi5_fan_speed, git_update)
time.sleep(config.update_check_interval) stop_event.wait(config.update_check_interval)
if stop_event.is_set():
break
def on_message(client, userdata, msg): def on_message(client, userdata, msg):
global exit_flag global exit_flag
@@ -552,9 +557,15 @@ def on_message(client, userdata, msg):
update.do_update(script_dir, version, git_update=True, config_update=True) update.do_update(script_dir, version, git_update=True, config_update=True)
print("Update completed. Setting exit flag...") print("Update completed. Setting exit flag...")
exit_flag = True exit_flag = True
stop_event.set() # Signal the threads to stop
thread1.join() # Wait for thread1 to finish
thread2.join() # Wait for thread2 to finish
sys.exit(0) # Exit the script
exit_flag = False exit_flag = False
# Create a stop event
stop_event = threading.Event()
if __name__ == '__main__': if __name__ == '__main__':
script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
@@ -591,6 +602,9 @@ if __name__ == '__main__':
while True: while True:
if exit_flag: if exit_flag:
print("Exit flag set. Exiting the application...") print("Exit flag set. Exiting the application...")
stop_event.set() # Signal the threads to stop
thread1.join() # Wait for thread1 to finish
thread2.join() # Wait for thread2 to finish
sys.exit(0) sys.exit(0)
time.sleep(1) # Check the exit flag every second time.sleep(1) # Check the exit flag every second
else: else: