From 1b3962cdc5e8030667b3c61194e43dea19965fd1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 1 Jun 2024 14:37:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=90=8Erestart=E5=90=AF=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90license?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_element/service/ne_version.impl.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/network_element/service/ne_version.impl.go b/src/modules/network_element/service/ne_version.impl.go index f7a31409..bdae5dc1 100644 --- a/src/modules/network_element/service/ne_version.impl.go +++ b/src/modules/network_element/service/ne_version.impl.go @@ -248,6 +248,7 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n") cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"])) + cmdStrArr = append(cmdStrArr, "sudo ims-stop || true && sudo ims-start \n") // 30s后停止服务 // cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 30s && sudo ims-stop\" > /dev/null 2>&1 & \n") } else { @@ -455,6 +456,7 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s n3iwf' /etc/hosts || echo '%s n3iwf' | sudo tee -a /etc/hosts \n", para5GData["N3IWF_IP"], para5GData["N3IWF_IP"])) } + cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo service %s restart \n", neTypeLower)) // 30s后停止服务 // cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 30s && sudo service %s stop\" > /dev/null 2>&1 & \n", neTypeLower)) } else { @@ -484,8 +486,8 @@ func (r *NeVersionImpl) operateRun(sshClient *ssh.ConnSSH, preinput map[string]s firstRead := true // 首次命令进行记录日志信息 commandLineText := "" // 日志信息 done := make(chan bool) // 完成信号 - // 超时退出 60s - timeoutTicker := time.NewTicker(60 * time.Second) + // 超时退出 120s + timeoutTicker := time.NewTicker(120 * time.Second) defer timeoutTicker.Stop() // 实时读取SSH消息直接输出 msTicker := time.NewTicker(100 * time.Millisecond)