OMC/nms_cxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 将restagent改为omc

Browse Source
This commit is contained in:
TsMask
2024-07-10 15:33:45 +08:00
parent f5a2d79346
commit 14bf73130c
14 changed files with 19 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/network_element/controller/action.go
View File

@@ -221,7 +221,7 @@ func (s *NeActionController) Service(c *gin.Context) {
neTypeLower := strings.ToLower(neInfo.NeType)
cmdStr := fmt.Sprintf("sudo service %s %s", neTypeLower, body.Action)
if neTypeLower == "omc" {
cmdStr = fmt.Sprintf("nohup sh -c \"sudo systemctl stop restagent && sleep 5s && sudo systemctl %s restagent\" > /dev/null 2>&1 &", body.Action)
cmdStr = fmt.Sprintf("nohup sh -c \"sudo systemctl stop omc && sleep 5s && sudo systemctl %s omc\" > /dev/null 2>&1 &", body.Action)
} else if neTypeLower == "ims" {
if body.Action == "restart" {
cmdStr = "ims-stop || true && ims-start"

2
src/modules/network_element/service/ne_license.impl.go
View File

@@ -183,7 +183,7 @@ func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error {
if neTypeLower == "ims" {
cmdStr = "ims-stop || true && ims-start"
} else if neTypeLower == "omc" {
cmdStr = "sudo systemctl restart restagent"
cmdStr = "sudo systemctl restart omc"
}
sshClient.RunCMD(cmdStr)
}

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

@@ -207,7 +207,7 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
} else {
omcStrArr = append(omcStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade") // 升级数据库
}
omcStrArr = append(omcStrArr, "sudo systemctl restart restagent") // 重启服务
omcStrArr = append(omcStrArr, "sudo systemctl restart omc") // 重启服务
omcStrArr = append(omcStrArr, fmt.Sprintf("sudo rm %s", strings.Join(neFilePaths, " "))) // 删除软件包
// 2s后安装

2
src/modules/nms_cxy/service/config.impl.go
View File

@@ -510,7 +510,7 @@ func (s *ConfigImpl) paramModifyBase(neInfo neModel.NeInfo, operPara map[string]
neTypeLower := strings.ToLower(neInfo.NeType)
cmdStr := fmt.Sprintf("sudo service %s restart", neTypeLower)
if neTypeLower == "omc" {
cmdStr = "nohup sh -c \"sudo systemctl stop restagent && sleep 5s && sudo systemctl restart restagent\" > /dev/null 2>&1 &"
cmdStr = "nohup sh -c \"sudo systemctl stop omc && sleep 5s && sudo systemctl restart omc\" > /dev/null 2>&1 &"
} else if neTypeLower == "ims" {
cmdStr = "ims-stop || true && ims-start"
}