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

add python 3 compitability

Browse Source
This commit is contained in:
Hristo Jelev
2020-12-17 19:51:54 +02:00
parent fdb381b5a5
commit 722b6694fd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpi-cpu2mqtt.py
View File

@@ -24,7 +24,7 @@ def check_cpu_load():
# bash command to get cpu load from uptime command # bash command to get cpu load from uptime command
p = subprocess.Popen("uptime", shell=True, stdout=subprocess.PIPE).communicate()[0] p = subprocess.Popen("uptime", shell=True, stdout=subprocess.PIPE).communicate()[0]
cores = subprocess.Popen("nproc", shell=True, stdout=subprocess.PIPE).communicate()[0] cores = subprocess.Popen("nproc", shell=True, stdout=subprocess.PIPE).communicate()[0]
cpu_load = p.split("average:")[1].split(",")[0].replace(' ', '') cpu_load = str(p).split("average:")[1].split(",")[0].replace(' ', '')
cpu_load = float(cpu_load)/int(cores)*100 cpu_load = float(cpu_load)/int(cores)*100
cpu_load = round(float(cpu_load), 1) cpu_load = round(float(cpu_load), 1)
return cpu_load return cpu_load
@@ -50,7 +50,7 @@ def check_memory():
def check_cpu_temp(): def check_cpu_temp():
full_cmd = "vcgencmd measure_temp" full_cmd = "vcgencmd measure_temp"
p = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0] p = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0]
cpu_temp = p.replace('\n', ' ').replace('\r', '').split("=")[1].split("'")[0] cpu_temp = str(p).replace('\n', ' ').replace('\r', '').split("=")[1].split("'")[0]
return cpu_temp return cpu_temp
def check_sys_clock_speed(): def check_sys_clock_speed():
@@ -104,7 +104,7 @@ def bulk_publish_to_mqtt (cpu_load = 0, cpu_temp = 0, used_space = 0, voltage =
# connect to mqtt server # connect to mqtt server
client = paho.Client() client = paho.Client()
client.username_pw_set(config.mqtt_user, config.mqtt_password) client.username_pw_set(config.mqtt_user, config.mqtt_password)
client.connect(config.mqtt_host, config.mqtt_port) client.connect(config.mqtt_host, int(config.mqtt_port))
# publish monitored values to MQTT # publish monitored values to MQTT
client.publish(config.mqtt_topic_prefix+"/"+hostname, values, qos=1) client.publish(config.mqtt_topic_prefix+"/"+hostname, values, qos=1)