improves

Author: yungwine

mytoncore/functions.py

@@ -1,16 +1,15 @@
 #!/usr/bin/env python3
 # -*- coding: utf_8 -*-l
 import os
-import re
 import sys
 import psutil
 import time
 import json
 import requests
 import subprocess
 
-from mytoncore.mytoncore import MyTonCore, Dec2HexAddr
-from mytoncore.tonblocksscanner import TonBlocksScanner
+from mytoncore.mytoncore import MyTonCore
+from mytoncore.utils import parse_db_stats
 from mypylib.mypylib import (
     b2mb,
     get_timestamp,
@@ -420,24 +419,6 @@ def GetValidatorProcessInfo():
 # end define
 
 
-def parse_db_stats(path: str):
-    with open(path) as f:
-        lines = f.readlines()
-    result = {}
-    for line in lines:
-        s = line.strip().split(maxsplit=1)
-        items = re.findall(r"(\S+)\s:\s(\S+)", s[1])
-        if len(items) == 1:
-            item = items[0]
-            if float(item[1]) > 0:
-                result[s[0]] = float(item[1])
-        else:
-            if any(float(v) > 0 for k, v in items):
-                result[s[0]] = {}
-                result[s[0]] = {k: float(v) for k, v in items}
-    return result
-
-
 def get_db_stats():
     result = {
         'rocksdb': {
@@ -462,6 +443,8 @@ def get_db_stats():
     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)
@@ -471,7 +454,10 @@ def get_db_stats():
     else:
         result['celldb']['ok'] = False
         result['celldb']['message'] = 'db stats file is not exists'
+    # end if
+
     return result
+# end define
 
 
 def Telemetry(local, ton):
@@ -497,7 +483,7 @@ def Telemetry(local, ton):
     data["swap"] = GetSwapInfo()
     data["uname"] = GetUname()
     data["vprocess"] = GetValidatorProcessInfo()
-    data["db"] = get_db_stats()
+    data["dbStats"] = get_db_stats()
     elections = local.try_function(ton.GetElectionEntries)
     complaints = local.try_function(ton.GetComplaints)
 

mytoncore/utils.py

@@ -1,5 +1,6 @@
 import base64
 import json
+import re
 
 
 def str2b64(s):
@@ -49,19 +50,19 @@ def b642hex(input):
 
 
 def xhex2hex(x):
-	try:
-		b = x[1:]
-		h = b.lower()
-		return h
-	except:
-		return None
+    try:
+        b = x[1:]
+        h = b.lower()
+        return h
+    except:
+        return None
 #end define
 
 def hex2base64(h):  # TODO: remove duplicates
-	b = bytes.fromhex(h)
-	b64 = base64.b64encode(b)
-	s = b64.decode("utf-8")
-	return s
+    b = bytes.fromhex(h)
+    b64 = base64.b64encode(b)
+    s = b64.decode("utf-8")
+    return s
 #end define
 
 
@@ -73,7 +74,26 @@ def str2bool(str):
 
 
 def ng2g(ng):
-	if ng is None:
-		return
-	return int(ng)/10**9
+    if ng is None:
+        return
+    return int(ng)/10**9
 #end define
+
+
+def parse_db_stats(path: str):
+    with open(path) as f:
+        lines = f.readlines()
+    result = {}
+    for line in lines:
+        s = line.strip().split(maxsplit=1)
+        items = re.findall(r"(\S+)\s:\s(\S+)", s[1])
+        if len(items) == 1:
+            item = items[0]
+            if float(item[1]) > 0:
+                result[s[0]] = float(item[1])
+        else:
+            if any(float(v) > 0 for k, v in items):
+                result[s[0]] = {}
+                result[s[0]] = {k: float(v) for k, v in items}
+    return result
+# end define