bugfix

Author: igroman787

mytoncore.py

@@ -3758,11 +3758,11 @@ def Elections(ton):
 		ton.ElectionEntry()
 #end define
 
-def Statistics(scanner):
+def Statistics():
 	ReadNetworkData()
 	SaveNetworkStatistics()
-	ReadTransData(scanner)
-	SaveTransStatistics()
+	#ReadTransData(scanner)
+	#SaveTransStatistics()
 	ReadDiskData()
 	SaveDiskStatistics()
 #end define
@@ -3862,7 +3862,6 @@ def ReadNetworkData():
 	buff = psutil.net_io_counters(pernic=True)
 	buff = buff[interfaceName]
 	data = dict()
-	data = dict()
 	data["timestamp"] = timestamp
 	data["bytesRecv"] = buff.bytes_recv
 	data["bytesSent"] = buff.bytes_sent
@@ -4087,7 +4086,7 @@ def Telemetry(ton):
 	data["stake"] = local.db.get("stake")
 
 	# Get validator config
-	vconfig = self.GetValidatorConfig()
+	vconfig = ton.GetValidatorConfig()
 	data["fullnode_adnl"] = vconfig.fullnode
 
 	# Send data to toncenter server
@@ -4192,12 +4191,10 @@ def ScanLiteServers(ton):
 def General():
 	local.add_log("start General function", "debug")
 	ton = MyTonCore()
-	scanner = Dict()
-	#scanner.Run()
 
 	# Запустить потоки
 	local.start_cycle(Elections, sec=600, args=(ton, ))
-	local.start_cycle(Statistics, sec=10, args=(scanner,))
+	local.start_cycle(Statistics, sec=10)
 	local.start_cycle(Offers, sec=600, args=(ton, ))
 	local.start_cycle(Complaints, sec=600, args=(ton, ))
 	local.start_cycle(Slashing, sec=600, args=(ton, ))

mytonctrl.py

@@ -127,7 +127,7 @@ def check_vport():
 		color_print(local.translate("vport_error"))
 #end define
 
-def check_git(input_args, default_repo):
+def check_git(input_args, default_repo, text):
 	src_dir = "/usr/src"
 	git_path = f"{src_dir}/{default_repo}"
 	default_author = "ton-blockchain"
@@ -147,9 +147,9 @@ def check_git(input_args, default_repo):
 	if ((need_author is None and local_author != default_author) or 
 		(need_repo is None and local_repo != default_repo)):
 		remote_url = f"https://github.com/{local_author}/{local_repo}/tree/{need_branch if need_branch else local_branch}"
-		raise Exception(f"update error: You are on {remote_url} remote url, to update to the tip use `update {remote_url}` command")
+		raise Exception(f"{text} error: You are on {remote_url} remote url, to {text} to the tip use `{text} {remote_url}` command")
 	elif need_branch is None and local_branch != default_branch:
-		raise Exception(f"update error: You are on {local_branch} branch, to update to the tip of {local_branch} branch use `update {local_branch}` command")
+		raise Exception(f"{text} error: You are on {local_branch} branch, to {text} to the tip of {local_branch} branch use `{text} {local_branch}` command")
 	#end if
 
 	if need_author is None:
@@ -185,7 +185,7 @@ def GetAuthorRepoBranchFromArgs(args):
 
 def Update(args):
 	repo = "mytonctrl"
-	author, repo, branch = check_git(args, repo)
+	author, repo, branch = check_git(args, repo, "update")
 
 	# Run script
 	runArgs = ["bash", "/usr/src/mytonctrl/scripts/update.sh", "-a", author, "-r", repo, "-b", branch]
@@ -200,7 +200,7 @@ def Update(args):
 
 def Upgrade(args):
 	repo = "ton"
-	author, repo, branch = check_git(args, repo)
+	author, repo, branch = check_git(args, repo, "upgrade")
 
 	# Run script
 	runArgs = ["bash", "/usr/src/mytonctrl/scripts/upgrade.sh", "-a", author, "-r", repo, "-b", branch]