Merge pull request #261 from yungwine/check-git

fix git config in status and telemetry

Author: igroman787

mytoncore/functions.py

@@ -10,6 +10,7 @@
 import subprocess
 
 from mytoncore.mytoncore import MyTonCore
+from mytonctrl.utils import fix_git_config
 from mytoninstaller.config import GetConfig
 from mypylib.mypylib import (
     b2mb,
@@ -420,7 +421,9 @@ def Telemetry(local, ton):
 
     # Get git hashes
     gitHashes = dict()
-    gitHashes["mytonctrl"] = get_git_hash("/usr/src/mytonctrl")
+    mtc_path = "/usr/src/mytonctrl"
+    local.try_function(fix_git_config, args=[mtc_path])
+    gitHashes["mytonctrl"] = get_git_hash(mtc_path)
     gitHashes["validator"] = GetBinGitHash(
         "/usr/bin/ton/validator-engine/validator-engine")
     data["gitHashes"] = gitHashes

mytonctrl/mytonctrl.py

@@ -40,7 +40,7 @@
 	GetBinGitHash,
 )
 from mytonctrl.migrate import run_migrations
-from mytonctrl.utils import GetItemFromList, timestamp2utcdatetime
+from mytonctrl.utils import GetItemFromList, timestamp2utcdatetime, fix_git_config
 
 import sys, getopt, os
 
@@ -290,21 +290,6 @@ def check_vport(local, ton):
 #end define
 
 
-def fix_git_config(git_path: str):
-	args = ["git", "status"]
-	try:
-		process = subprocess.run(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=git_path, timeout=3)
-		err = process.stderr.decode("utf-8")
-	except Exception as e:
-		err = str(e)
-	if err:
-		if 'git config --global --add safe.directory' in err:
-			args = ["git", "config", "--global", "--add", "safe.directory", git_path]
-			subprocess.run(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=3)
-		else:
-			raise Exception(f'Failed to check git status: {err}')
-#end define
-
 def check_git(input_args, default_repo, text):
 	src_dir = "/usr/src"
 	git_path = f"{src_dir}/{default_repo}"
@@ -708,6 +693,8 @@ def PrintLocalStatus(local, adnlAddr, validatorIndex, validatorEfficiency, valid
 	validatorBinGitPath = "/usr/bin/ton/validator-engine/validator-engine"
 	mtcGitHash = get_git_hash(mtcGitPath, short=True)
 	validatorGitHash = GetBinGitHash(validatorBinGitPath, short=True)
+	fix_git_config(mtcGitPath)
+	fix_git_config(validatorGitPath)
 	mtcGitBranch = get_git_branch(mtcGitPath)
 	validatorGitBranch = get_git_branch(validatorGitPath)
 	mtcGitHash_text = bcolors.yellow_text(mtcGitHash)

mytonctrl/utils.py

@@ -1,3 +1,4 @@
+import subprocess
 import time
 
 
@@ -12,3 +13,19 @@ def GetItemFromList(data, index):
         return data[index]
     except:
         pass
+
+
+def fix_git_config(git_path: str):
+    args = ["git", "status"]
+    try:
+        process = subprocess.run(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=git_path, timeout=3)
+        err = process.stderr.decode("utf-8")
+    except Exception as e:
+        err = str(e)
+    if err:
+        if 'git config --global --add safe.directory' in err:
+            args = ["git", "config", "--global", "--add", "safe.directory", git_path]
+            subprocess.run(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=3)
+        else:
+            raise Exception(f'Failed to check git status: {err}')
+#end define