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

check_memory fails if system language is different than EN: fix (#139)

Browse Source
This commit is contained in:
Masoko
2024-10-19 16:45:11 +03:00
committed by GitHub
parent 315ef95c24
commit 56a8849045
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpi-cpu2mqtt.py
View File

@@ -82,11 +82,9 @@ def check_swap():
def check_memory(): def check_memory():
full_cmd = "free | grep -i mem | awk 'NR == 1 {print $3/$2*100}'" full_cmd = 'free -b | awk \'NR==2 {printf "%.2f\\n", $3/$2 * 100}\''
memory = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0] memory = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0]
if not memory:
full_cmd = "free | grep -i speicher | awk 'NR == 1 {print $3/$2*100}'"
memory = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0]
if memory: if memory:
memory = round(float(memory.decode("utf-8").replace(",", "."))) memory = round(float(memory.decode("utf-8").replace(",", ".")))
else: else:
@@ -280,15 +278,13 @@ def print_measured_values(cpu_load=0, cpu_temp=0, used_space=0, voltage=0, sys_c
for device, temp in drive_temps.items(): for device, temp in drive_temps.items():
output += f"{device.capitalize()} Temp: {temp:.2f}°C\n" output += f"{device.capitalize()} Temp: {temp:.2f}°C\n"
output += """\nInstallation directory: {} output += """\n Installation directory: {}
:: Release notes {}: :: Release notes {}:
{}""".format(script_dir, remote_version, get_release_notes(remote_version).strip()) {}""".format(script_dir, remote_version, get_release_notes(remote_version).strip())
print(output) print(output)
def extract_text(html_string): def extract_text(html_string):
html_string = html.unescape(html_string) html_string = html.unescape(html_string)
text = re.sub('<[^<]+?>', '', html_string) text = re.sub('<[^<]+?>', '', html_string)