Merge pull request #243 from yungwine/mytonctrl2_dev

dev

Author: igroman787

mytoncore/functions.py

@@ -10,18 +10,16 @@
 import subprocess
 
 from mytoncore.mytoncore import MyTonCore
-from mytoncore.utils import parse_db_stats
 from mytoninstaller.config import GetConfig
 from mypylib.mypylib import (
     b2mb,
     get_timestamp,
     get_internet_interface_name,
     get_git_hash,
-    get_service_pid,
     get_load_avg,
     thr_sleep,
-    Dict
 )
+from mytoncore.telemetry import *
 from mytoninstaller.node_args import get_node_args
 
 
@@ -382,141 +380,6 @@ def Domains(local, ton):
 # end define
 
 
-def GetUname():
-    data = os.uname()
-    result = dict(
-        zip('sysname nodename release version machine'.split(), data))
-    result.pop("nodename")
-    return result
-# end define
-
-
-def GetMemoryInfo():
-    result = dict()
-    data = psutil.virtual_memory()
-    result["total"] = round(data.total / 10**9, 2)
-    result["usage"] = round(data.used / 10**9, 2)
-    result["usagePercent"] = data.percent
-    return result
-# end define
-
-
-def GetSwapInfo():
-    result = dict()
-    data = psutil.swap_memory()
-    result["total"] = round(data.total / 10**9, 2)
-    result["usage"] = round(data.used / 10**9, 2)
-    result["usagePercent"] = data.percent
-    return result
-# end define
-
-
-def GetValidatorProcessInfo():
-    pid = get_service_pid("validator")
-    if pid == None or pid == 0:
-        return
-    p = psutil.Process(pid)
-    mem = p.memory_info()
-    result = dict()
-    result["cpuPercent"] = p.cpu_percent()
-    memory = dict()
-    memory["rss"] = mem.rss
-    memory["vms"] = mem.vms
-    memory["shared"] = mem.shared
-    memory["text"] = mem.text
-    memory["lib"] = mem.lib
-    memory["data"] = mem.data
-    memory["dirty"] = mem.dirty
-    result["memory"] = memory
-    # io = p.io_counters() # Permission denied: '/proc/{pid}/io'
-    return result
-# end define
-
-
-def get_db_stats():
-    result = {
-        'rocksdb': {
-            'ok': True,
-            'message': '',
-            'data': {}
-        },
-        'celldb': {
-            'ok': True,
-            'message': '',
-            'data': {}
-        },
-    }
-    rocksdb_stats_path = '/var/ton-work/db/db_stats.txt'
-    celldb_stats_path = '/var/ton-work/db/celldb/db_stats.txt'
-    if os.path.exists(rocksdb_stats_path):
-        try:
-            result['rocksdb']['data'] = parse_db_stats(rocksdb_stats_path)
-        except Exception as e:
-            result['rocksdb']['ok'] = False
-            result['rocksdb']['message'] = f'failed to fetch db stats: {e}'
-    else:
-        result['rocksdb']['ok'] = False
-        result['rocksdb']['message'] = 'db stats file is not exists'
-    # end if
-
-    if os.path.exists(celldb_stats_path):
-        try:
-            result['celldb']['data'] = parse_db_stats(celldb_stats_path)
-        except Exception as e:
-            result['celldb']['ok'] = False
-            result['celldb']['message'] = f'failed to fetch db stats: {e}'
-    else:
-        result['celldb']['ok'] = False
-        result['celldb']['message'] = 'db stats file is not exists'
-    # end if
-
-    return result
-# end define
-
-
-def get_cpu_name():
-    with open('/proc/cpuinfo') as f:
-        for line in f:
-            if line.strip():
-                if line.rstrip('\n').startswith('model name'):
-                    return line.rstrip('\n').split(':')[1].strip()
-    return None
-
-
-def is_host_virtual():
-    try:
-        with open('/sys/class/dmi/id/product_name') as f:
-            product_name = f.read().strip().lower()
-            if 'virtual' in product_name or 'kvm' in product_name or 'qemu' in product_name or 'vmware' in product_name:
-                return {'virtual': True, 'product_name': product_name}
-            return {'virtual': False, 'product_name': product_name}
-    except FileNotFoundError:
-        return {'virtual': None, 'product_name': None}
-
-
-def do_beacon_ping(host, count, timeout):
-    args = ['ping', '-c', str(count), '-W', str(timeout), host]
-    process = subprocess.run(args, stdin=subprocess.PIPE,
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=timeout)
-    output = process.stdout.decode("utf-8")
-    avg = output.split('\n')[-2].split('=')[1].split('/')[1]
-    return float(avg)
-
-
-def get_pings_values():
-    return {
-        'beacon-eu-01.toncenter.com': do_beacon_ping('beacon-eu-01.toncenter.com', 5, 10),
-        'beacon-apac-01.toncenter.com': do_beacon_ping('beacon-apac-01.toncenter.com', 5, 10)
-    }
-
-
-def get_validator_disk_name():
-    process = subprocess.run("df -h /var/ton-work/ | sed -n '2 p' | awk '{print $1}'", stdin=subprocess.PIPE,
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=3, shell=True)
-    output = process.stdout.decode("utf-8")
-    return output.strip()
-
-
 def Telemetry(local, ton):
     sendTelemetry = local.db.get("sendTelemetry")
     if sendTelemetry is not True:
@@ -540,13 +403,11 @@ def Telemetry(local, ton):
     data["swap"] = GetSwapInfo()
     data["uname"] = GetUname()
     data["vprocess"] = GetValidatorProcessInfo()
-    data["dbStats"] = get_db_stats()
-    data["nodeArgs"] = get_node_args()
-    data["cpuInfo"] = {'cpuName': get_cpu_name(), 'virtual': is_host_virtual()}
-    data["validatorDiskName"] = get_validator_disk_name()
-    data["pings"] = get_pings_values()
-    elections = local.try_function(ton.GetElectionEntries)
-    complaints = local.try_function(ton.GetComplaints)
+    data["dbStats"] = local.try_function(get_db_stats)
+    data["nodeArgs"] = local.try_function(get_node_args)
+    data["cpuInfo"] = {'cpuName': local.try_function(get_cpu_name), 'virtual': local.try_function(is_host_virtual)}
+    data["validatorDiskName"] = local.try_function(get_validator_disk_name)
+    data["pings"] = local.try_function(get_pings_values)
 
     # Get git hashes
     gitHashes = dict()
@@ -645,6 +506,11 @@ def Slashing(local, ton):
 # end define
 
 
+def save_past_events(local, ton):
+    local.try_function(ton.GetElectionEntries)
+    local.try_function(ton.GetComplaints)
+
+
 def ScanLiteServers(local, ton):
     # Считать список серверов
     filePath = ton.liteClient.configPath
@@ -679,6 +545,7 @@ def General(local):
     local.start_cycle(Elections, sec=600, args=(local, ton, ))
     local.start_cycle(Statistics, sec=10, args=(local, ))
     local.start_cycle(Offers, sec=600, args=(local, ton, ))
+    local.start_cycle(save_past_events, sec=300, args=(local, ton, ))
 
     t = 600
     if ton.GetNetworkName() != 'mainnet':

mytoncore/telemetry.py

@@ -0,0 +1,143 @@
+import os
+import subprocess
+
+import psutil
+
+from mytoncore.utils import parse_db_stats
+from mypylib.mypylib import get_service_pid
+
+
+def GetUname():
+    data = os.uname()
+    result = dict(
+        zip('sysname nodename release version machine'.split(), data))
+    result.pop("nodename")
+    return result
+# end define
+
+
+def GetMemoryInfo():
+    result = dict()
+    data = psutil.virtual_memory()
+    result["total"] = round(data.total / 10**9, 2)
+    result["usage"] = round(data.used / 10**9, 2)
+    result["usagePercent"] = data.percent
+    return result
+# end define
+
+
+def GetSwapInfo():
+    result = dict()
+    data = psutil.swap_memory()
+    result["total"] = round(data.total / 10**9, 2)
+    result["usage"] = round(data.used / 10**9, 2)
+    result["usagePercent"] = data.percent
+    return result
+# end define
+
+
+def GetValidatorProcessInfo():
+    pid = get_service_pid("validator")
+    if pid == None or pid == 0:
+        return
+    p = psutil.Process(pid)
+    mem = p.memory_info()
+    result = dict()
+    result["cpuPercent"] = p.cpu_percent()
+    memory = dict()
+    memory["rss"] = mem.rss
+    memory["vms"] = mem.vms
+    memory["shared"] = mem.shared
+    memory["text"] = mem.text
+    memory["lib"] = mem.lib
+    memory["data"] = mem.data
+    memory["dirty"] = mem.dirty
+    result["memory"] = memory
+    # io = p.io_counters() # Permission denied: '/proc/{pid}/io'
+    return result
+# end define
+
+
+def get_db_stats():
+    result = {
+        'rocksdb': {
+            'ok': True,
+            'message': '',
+            'data': {}
+        },
+        'celldb': {
+            'ok': True,
+            'message': '',
+            'data': {}
+        },
+    }
+    rocksdb_stats_path = '/var/ton-work/db/db_stats.txt'
+    celldb_stats_path = '/var/ton-work/db/celldb/db_stats.txt'
+    if os.path.exists(rocksdb_stats_path):
+        try:
+            result['rocksdb']['data'] = parse_db_stats(rocksdb_stats_path)
+        except Exception as e:
+            result['rocksdb']['ok'] = False
+            result['rocksdb']['message'] = f'failed to fetch db stats: {e}'
+    else:
+        result['rocksdb']['ok'] = False
+        result['rocksdb']['message'] = 'db stats file is not exists'
+    # end if
+
+    if os.path.exists(celldb_stats_path):
+        try:
+            result['celldb']['data'] = parse_db_stats(celldb_stats_path)
+        except Exception as e:
+            result['celldb']['ok'] = False
+            result['celldb']['message'] = f'failed to fetch db stats: {e}'
+    else:
+        result['celldb']['ok'] = False
+        result['celldb']['message'] = 'db stats file is not exists'
+    # end if
+
+    return result
+# end define
+
+
+def get_cpu_name():
+    with open('/proc/cpuinfo') as f:
+        for line in f:
+            if line.strip():
+                if line.rstrip('\n').startswith('model name'):
+                    return line.rstrip('\n').split(':')[1].strip()
+    return None
+
+
+def is_host_virtual():
+    try:
+        with open('/sys/class/dmi/id/product_name') as f:
+            product_name = f.read().strip().lower()
+            if 'virtual' in product_name or 'kvm' in product_name or 'qemu' in product_name or 'vmware' in product_name:
+                return {'virtual': True, 'product_name': product_name}
+            return {'virtual': False, 'product_name': product_name}
+    except FileNotFoundError:
+        return {'virtual': None, 'product_name': None}
+
+
+def do_beacon_ping(host, count, timeout):
+    args = ['ping', '-c', str(count), '-W', str(timeout), host]
+    process = subprocess.run(args, stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=timeout)
+    output = process.stdout.decode("utf-8")
+    avg = output.split('\n')[-2].split('=')[1].split('/')[1]
+    return float(avg)
+
+
+def get_pings_values():
+    return {
+        'beacon-eu-01.toncenter.com': do_beacon_ping('beacon-eu-01.toncenter.com', 5, 10),
+        'beacon-apac-01.toncenter.com': do_beacon_ping('beacon-apac-01.toncenter.com', 5, 10)
+    }
+
+
+def get_validator_disk_name():
+    process = subprocess.run("df -h /var/ton-work/ | sed -n '2 p' | awk '{print $1}'", stdin=subprocess.PIPE,
+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=3, shell=True)
+    output = process.stdout.decode("utf-8")
+    return output.strip()
+

mytonctrl/mytonctrl.py

@@ -223,7 +223,7 @@ def about(local, ton, args):
 #end define
 
 
-def check_installer_user():
+def check_installer_user(local):
 	args = ["whoami"]
 	process = subprocess.run(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=3)
 	username = process.stdout.decode("utf-8").strip()
@@ -234,13 +234,13 @@ def check_installer_user():
 	actual_user = output.split('\n')[1].split()[2]
 
 	if username != actual_user:
-		raise Exception(f'mytonctrl was installed by another user. Probably you need to launch mtc with `{actual_user}` user.')
+		local.add_log(f'mytonctrl was installed by another user. Probably you need to launch mtc with `{actual_user}` user.', 'error')
 #end define
 
 
 def PreUp(local, ton):
 	CheckMytonctrlUpdate(local)
-	check_installer_user()
+	check_installer_user(local)
 	check_vport(local, ton)
 	warnings(local, ton)
 	# CheckTonUpdate()