print ls stats to status

refactor

Author: yungwine

mytoncore/functions.py

@@ -287,7 +287,7 @@ def CalculateNetworkStatistics(zerodata, data):
 
 
 def save_node_statistics(local, ton):
-    status = ton.GetValidatorStatus()
+    status = ton.GetValidatorStatus(no_cache=True)
     if status.unixtime is None:
         return
     data = {'timestamp': status.unixtime}

mytoncore/mytoncore.py

@@ -771,11 +771,11 @@ def parse_stats_from_vc(self, output: str, result: dict):
 				if name not in result:
 					result[name] = value
 
-	def GetValidatorStatus(self):
+	def GetValidatorStatus(self, no_cache=False):
 		# Get buffer
 		bname = "validator_status"
 		buff = self.GetFunctionBuffer(bname)
-		if buff:
+		if buff and not no_cache:
 			return buff
 		#end if
 
@@ -3038,6 +3038,40 @@ def GetStatistics(self, name, statistics=None):
 		return data
 	#end define
 
+	def get_node_statistics(self):
+		"""
+		:return: stats for collated/validated blocks since round beggining and stats for ls queries for the last minute
+		"""
+		stats = self.local.db.get('statistics', {}).get('node')
+		result = {}
+		if stats is not None and len(stats) == 3 and stats[0] is not None:
+			collated_ok = 0
+			collated_error = 0
+			validated_ok = 0
+			validated_error = 0
+			for k in ['master', 'shard']:
+				collated_ok += stats[2]['collated_blocks'][k]['ok'] - stats[0]['collated_blocks'][k]['ok']
+				collated_error += stats[2]['collated_blocks'][k]['error'] - stats[0]['collated_blocks'][k]['error']
+				validated_ok += stats[2]['validated_blocks'][k]['ok'] - stats[0]['validated_blocks'][k]['ok']
+				validated_error += stats[2]['validated_blocks'][k]['error'] - stats[0]['validated_blocks'][k]['error']
+			result = {
+				'collated': {
+					'ok': collated_ok,
+					'error': collated_error,
+				},
+				'validated': {
+					'ok': validated_ok,
+					'error': validated_error,
+				},
+			}
+		if stats is not None and len(stats) >= 2:
+			result['ls_queries'] = {
+				'ok': stats[-1]['ls_queries']['ok'] - stats[-2]['ls_queries']['ok'],
+				'error': stats[-1]['ls_queries']['error'] - stats[-2]['ls_queries']['error'],
+				'time': stats[-1].get('timestamp', 0) - stats[-2].get('timestamp', 0),
+			}
+		return result
+
 	def GetSettings(self, name):
 		# self.local.load_db()
 		result = self.local.db.get(name)

mytonctrl/mytonctrl.py

@@ -752,21 +752,16 @@ def PrintLocalStatus(local, ton, adnlAddr, validatorIndex, validatorEfficiency,
 		validator_out_of_ser_text = local.translate("local_status_validator_out_of_ser").format(f'{validator_status.out_of_ser} blocks ago')
 
 	collated, validated = None, None
+	ls_queries = None
 	if ton.using_validator() and validatorIndex != -1:
-		stats = ton.local.db.get('statistics', {}).get('node')
-		if stats is not None and len(stats) == 3:
-			collated_ok = 0
-			collated_error = 0
-			validated_ok = 0
-			validated_error = 0
-			for k in ['master', 'shard']:
-				collated_ok += stats[2]['collated_blocks'][k]['ok'] - stats[0]['collated_blocks'][k]['ok']
-				collated_error += stats[2]['collated_blocks'][k]['error'] - stats[0]['collated_blocks'][k]['error']
-				validated_ok += stats[2]['validated_blocks'][k]['ok'] - stats[0]['validated_blocks'][k]['ok']
-				validated_error += stats[2]['validated_blocks'][k]['error'] - stats[0]['validated_blocks'][k]['error']
-			collated = local.translate['collated_blocks'].format(collated_ok, collated_error)
-			validated = local.translate['validated_blocks'].format(validated_ok, validated_error)
-
+		node_stats = ton.get_node_statistics()
+		if node_stats and 'collated' in node_stats and 'validated' in node_stats:
+			collated = local.translate('collated_blocks').format(node_stats['collated']['ok'], node_stats['collated']['error'])
+			validated = local.translate('validated_blocks').format(node_stats['validated']['ok'], node_stats['validated']['error'])
+	if ton.using_liteserver():
+		node_stats = ton.get_node_statistics()
+		if node_stats and 'ls_queries' in node_stats:
+			ls_queries = local.translate('ls_queries').format(node_stats['ls_queries']['time'], node_stats['ls_queries']['ok'], node_stats['ls_queries']['error'])
 
 	dbSize_text = GetColorInt(dbSize, 1000, logic="less", ending=" Gb")
 	dbUsage_text = GetColorInt(dbUsage, 80, logic="less", ending="%")
@@ -817,11 +812,13 @@ def PrintLocalStatus(local, ton, adnlAddr, validatorIndex, validatorEfficiency,
 		print(validator_out_of_sync_text)
 		print(master_out_of_sync_text)
 		print(shard_out_of_sync_text)
+	if validator_out_of_ser_text:
+		print(validator_out_of_ser_text)
 	if collated and validated:
 		print(collated)
 		print(validated)
-	if validator_out_of_ser_text:
-		print(validator_out_of_ser_text)
+	if ls_queries:
+		print(ls_queries)
 	print(dbStatus_text)
 	print(mtcVersion_text)
 	print(validatorVersion_text)

mytonctrl/resources/translate.json

@@ -345,14 +345,19 @@
 		"zh_TW": "本地驗證者最後一次狀態序列化: {0}"
 	},
 	"collated_blocks": {
-		"en": "Collated blocks since validation round started (success/error): {0}",
-		"ru": "Собранные блоки с начала раунда валидации (успех/ошибка): {0}",
-		"zh_TW": "自驗證週期開始以來的彙編區塊 (成功/錯誤): {0}"
+		"en": "Collated blocks since validation round started (success/error): {0}/{1}",
+		"ru": "Собранные блоки с начала раунда валидации (успех/ошибка): {0}/{1}",
+		"zh_TW": "自驗證週期開始以來的彙編區塊 (成功/錯誤): {0}/{1}"
 	},
 	"validated_blocks": {
-		"en": "Validated blocks since validation round started (success/error): {0}",
-		"ru": "Проверенные блоки с начала раунда валидации (успех/ошибка): {0}",
-		"zh_TW": "自驗證週期開始以來的驗證區塊 (成功/錯誤): {0}"
+		"en": "Validated blocks since validation round started (success/error): {0}/{1}",
+		"ru": "Проверенные блоки с начала раунда валидации (успех/ошибка): {0}/{1}",
+		"zh_TW": "自驗證週期開始以來的驗證區塊 (成功/錯誤): {0}/{1}"
+	},
+	"ls_queries": {
+		"en": "Liteserver queries for the past {0} sec (success/error): {1}/{2}",
+		"ru": "Запросы к лайтсерверу за последние {0} сек (успех/ошибка): {1}/{2}",
+		"zh_TW": "過去 {0} 秒的輕量級服務器查詢 (成功/錯誤): {1}/{2}"
 	},
 	"local_status_db": {
 		"en": "Local validator database size: {0}, {1}",