OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 网元版本安装后restart启动生成license

Browse Source
This commit is contained in:
TsMask
2024-06-01 14:37:35 +08:00
parent 0fcaf4480a
commit 1b3962cdc5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/network_element/service/ne_version.impl.go
View File

@@ -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, "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, 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后停止服务 // 30s后停止服务
// cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 30s && sudo ims-stop\" > /dev/null 2>&1 & \n") // cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 30s && sudo ims-stop\" > /dev/null 2>&1 & \n")
} else { } 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("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后停止服务 // 30s后停止服务
// cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 30s && sudo service %s stop\" > /dev/null 2>&1 & \n", neTypeLower)) // cmdStrArr = append(cmdStrArr, fmt.Sprintf("nohup sh -c \"sleep 30s && sudo service %s stop\" > /dev/null 2>&1 & \n", neTypeLower))
} else { } else {
@@ -484,8 +486,8 @@ func (r *NeVersionImpl) operateRun(sshClient *ssh.ConnSSH, preinput map[string]s
firstRead := true // 首次命令进行记录日志信息 firstRead := true // 首次命令进行记录日志信息
commandLineText := "" // 日志信息 commandLineText := "" // 日志信息
done := make(chan bool) // 完成信号 done := make(chan bool) // 完成信号
// 超时退出 60s // 超时退出 120s
timeoutTicker := time.NewTicker(60 * time.Second) timeoutTicker := time.NewTicker(120 * time.Second)
defer timeoutTicker.Stop() defer timeoutTicker.Stop()
// 实时读取SSH消息直接输出 // 实时读取SSH消息直接输出
msTicker := time.NewTicker(100 * time.Millisecond) msTicker := time.NewTicker(100 * time.Millisecond)