1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-02-15 03:51:52 +00:00

Add VPS hostname to status info

This commit is contained in:
Ycarus 2019-07-13 05:30:58 +00:00
parent f725489f22
commit 65abfbf7f8

View file

@ -11,6 +11,7 @@ import uuid
import configparser import configparser
import subprocess import subprocess
import os import os
import socket
import re import re
import hashlib import hashlib
from datetime import timedelta from datetime import timedelta
@ -112,10 +113,11 @@ def login():
def status(): def status():
vps_loadavg = os.popen("cat /proc/loadavg | awk '{print $1\" \"$2\" \"$3}'").read().rstrip() vps_loadavg = os.popen("cat /proc/loadavg | awk '{print $1\" \"$2\" \"$3}'").read().rstrip()
vps_uptime = os.popen("cat /proc/uptime | awk '{print $1}'").read().rstrip() vps_uptime = os.popen("cat /proc/uptime | awk '{print $1}'").read().rstrip()
vps_hostname = socket.gethostname()
mptcp_enabled = os.popen('sysctl -n net.mptcp.mptcp_enabled').read().rstrip() mptcp_enabled = os.popen('sysctl -n net.mptcp.mptcp_enabled').read().rstrip()
if iface: if iface:
return jsonify({'vps': {'loadavg': vps_loadavg,'uptime': vps_uptime,'mptcp': mptcp_enabled}, 'network': {'tx': get_bytes('tx',iface),'rx': get_bytes('rx',iface)}}), 200 return jsonify({'vps': {'loadavg': vps_loadavg,'uptime': vps_uptime,'mptcp': mptcp_enabled,'hostname': vps_hostname}, 'network': {'tx': get_bytes('tx',iface),'rx': get_bytes('rx',iface)}}), 200
else: else:
return jsonify({'error': 'No iface defined','route': 'status'}), 200 return jsonify({'error': 'No iface defined','route': 'status'}), 200