From 14bf73130c874f35ddb7cabb4a8ffbf08cb7d8e1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 10 Jul 2024 15:33:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=86restagent=E6=94=B9=E4=B8=BAomc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/debbuild/usr/local/omc/bin/actpkg.sh | 4 +-- build/debbuild/usr/local/omc/bin/checkproc.sh | 2 +- build/debbuild/usr/local/omc/bin/omcsvc.sh | 4 +-- build/debbuild/usr/local/omc/bin/rbkpkg.sh | 4 +-- .../usr/local/omc/etc/default/omc.yaml | 12 ++----- features/cm/ne.go | 2 +- omc/config/config.go | 33 +------------------ omc/omc.go | 4 +-- src/framework/utils/machine/launch.go | 2 +- src/lib_features/readme.md | 2 +- .../network_element/controller/action.go | 2 +- .../service/ne_license.impl.go | 2 +- .../service/ne_version.impl.go | 2 +- src/modules/nms_cxy/service/config.impl.go | 2 +- 14 files changed, 19 insertions(+), 58 deletions(-) diff --git a/build/debbuild/usr/local/omc/bin/actpkg.sh b/build/debbuild/usr/local/omc/bin/actpkg.sh index 1a5fb2c..58a326f 100644 --- a/build/debbuild/usr/local/omc/bin/actpkg.sh +++ b/build/debbuild/usr/local/omc/bin/actpkg.sh @@ -16,7 +16,7 @@ fi case "${extension}" in deb) if [ ${neType} == "OMC" ]; then - systemctl stop restagent.service + systemctl stop omc.service fi expect < ${logFile} spawn dpkg -i --force-all "$filename" @@ -32,7 +32,7 @@ EOF ;; rpm) if [ ${neType} == "OMC" ]; then - systemctl stop restagent.service + systemctl stop omc.service fi expect < ${logFile} spawn rpm -Uvh "$filename" diff --git a/build/debbuild/usr/local/omc/bin/checkproc.sh b/build/debbuild/usr/local/omc/bin/checkproc.sh index 7050999..41585b1 100644 --- a/build/debbuild/usr/local/omc/bin/checkproc.sh +++ b/build/debbuild/usr/local/omc/bin/checkproc.sh @@ -1,6 +1,6 @@ #!/bin/bash -process_name="restagent" +process_name="omc" if ! pgrep -x "$process_name" >/dev/null; then echo "$process_name is not running. Restarting..." diff --git a/build/debbuild/usr/local/omc/bin/omcsvc.sh b/build/debbuild/usr/local/omc/bin/omcsvc.sh index ef5d18e..2a7d918 100644 --- a/build/debbuild/usr/local/omc/bin/omcsvc.sh +++ b/build/debbuild/usr/local/omc/bin/omcsvc.sh @@ -1,7 +1,7 @@ #!/bin/bash -ProcList="restagent crontask sshsvc captrace kvdb" -ProcListDesc="kvdb crontask sshsvc captrace restagent" +ProcList="omc kvdb" +ProcListDesc="kvdb omc" BinDir=/usr/local/omc/bin diff --git a/build/debbuild/usr/local/omc/bin/rbkpkg.sh b/build/debbuild/usr/local/omc/bin/rbkpkg.sh index ef9b455..efd9fa4 100644 --- a/build/debbuild/usr/local/omc/bin/rbkpkg.sh +++ b/build/debbuild/usr/local/omc/bin/rbkpkg.sh @@ -16,7 +16,7 @@ fi case "${extension}" in deb) if [ ${neType} == "OMC" ]; then - systemctl stop restagent.service + systemctl stop omc.service fi expect < ${logFile} spawn dpkg -i --force-all "$filename" @@ -32,7 +32,7 @@ EOF ;; rpm) if [ ${neType} == "OMC" ]; then - systemctl stop restagent.service + systemctl stop omc.service fi expect < ${logFile} spawn rpm -Uvh "$filename" diff --git a/build/debbuild/usr/local/omc/etc/default/omc.yaml b/build/debbuild/usr/local/omc/etc/default/omc.yaml index 2ad3f08..f8d408b 100644 --- a/build/debbuild/usr/local/omc/etc/default/omc.yaml +++ b/build/debbuild/usr/local/omc/etc/default/omc.yaml @@ -3,7 +3,7 @@ # duration: rotation time with xx hours, example: 1/12/24 hours # count: rotation count of log, default is 30 rotation logger: - file: /usr/local/omc/log/restagent.log + file: /usr/local/omc/log/omc.log level: warn duration: 24 count: 90 @@ -13,17 +13,9 @@ logger: # clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert, # 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts rest: - - ipv4: 0.0.0.0 + - ipv4: 127.0.0.1 ipv6: port: 33030 - - ipv4: 0.0.0.0 - ipv6: - port: 33443 - schema: https - clientAuthType: 0 - caFile: /usr/local/omc/etc/certs/omc-ca.crt - certFile: /usr/local/omc/etc/certs/omc-server.crt - keyFile: /usr/local/omc/etc/certs/omc-server.key webServer: enabled: false diff --git a/features/cm/ne.go b/features/cm/ne.go index 88fbcbf..a409022 100644 --- a/features/cm/ne.go +++ b/features/cm/ne.go @@ -862,7 +862,7 @@ func PostNeServiceAction(w http.ResponseWriter, r *http.Request) { // send 204 to fe firstly services.ResponseStatusOK204NoContent(w) //actionCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh %s", config.GetYamlConfig().NE.OmcDir, action) - actionCmd := fmt.Sprintf("sudo systemctl %s restagent", action) + actionCmd := fmt.Sprintf("sudo systemctl %s omc", action) go RunSSHCmd(sshHost, actionCmd) return // cmd := exec.Command("ssh", sshHost, actionCmd) diff --git a/omc/config/config.go b/omc/config/config.go index e3cd20d..f424356 100644 --- a/omc/config/config.go +++ b/omc/config/config.go @@ -370,7 +370,7 @@ func ReadTestConfigYaml(pfile string) (ret error) { } func GetDefaultUserAgent() string { - return "OMC-restagent/" + global.Version + return "OMC/" + global.Version } func GetOMCHostUrl() string { @@ -389,34 +389,3 @@ func GetOMCHostUrl() string { return fmt.Sprintf("%s://%s:%d", scheme, omcip, port) } - -// const defaultConfigFile = "./etc/restconf.yaml" - -// func init() { -// cfile := flag.String("c", defaultConfigFile, "config file") -// pv := flag.Bool("version", false, "print version") -// ph := flag.Bool("help", false, "print help") - -// //global.BuildTime = "Wed May 31 18:24:04 CST 2023" -// //global.GoVer = "go version go1.15.7 linux/arm64" -// flag.Parse() -// if *pv { -// fmt.Printf("OMC restagent version: %s\n%s\n%s\n\n", global.Version, global.BuildTime, global.GoVer) -// os.Exit(0) -// } -// if *ph { -// flag.Usage() -// os.Exit(0) -// } - -// // 使用viper读取配置 -// conf.InitConfig(*cfile) - -// ReadConfig(*cfile) -// if GetYamlConfig().OMC.UriPrefix != "" { -// UriPrefix = GetYamlConfig().OMC.UriPrefix -// } -// if GetYamlConfig().TestConfig.Enabled { -// ReadTestConfigYaml(GetYamlConfig().TestConfig.File) -// } -// } diff --git a/omc/omc.go b/omc/omc.go index bfec1b5..7f54caa 100644 --- a/omc/omc.go +++ b/omc/omc.go @@ -155,9 +155,9 @@ func main() { } log.InitLogger(conf.Logger.File, conf.Logger.Duration, conf.Logger.Count, "omc:", config.GetLogLevel()) - fmt.Printf("OMC restagent version: %s\n", global.Version) + fmt.Printf("OMC version: %s\n", global.Version) log.Infof("========================= OMC startup =========================") - log.Infof("OMC restagent version: %s %s %s", global.Version, global.BuildTime, global.GoVer) + log.Infof("OMC version: %s %s %s", global.Version, global.BuildTime, global.GoVer) err := dborm.InitDbClient(conf.Database.Type, conf.Database.User, conf.Database.Password, conf.Database.Host, conf.Database.Port, conf.Database.Name, conf.Database.ConnParam) diff --git a/src/framework/utils/machine/launch.go b/src/framework/utils/machine/launch.go index e882bd7..acb3d18 100644 --- a/src/framework/utils/machine/launch.go +++ b/src/framework/utils/machine/launch.go @@ -164,7 +164,7 @@ func Reset() error { return err } // 重启服务 - if _, err := cmd.Execf("nohup sh -c \"sleep 1s && %s\" > /dev/null 2>&1 &", "sudo systemctl restart restagent"); err != nil { + if _, err := cmd.Execf("nohup sh -c \"sleep 1s && %s\" > /dev/null 2>&1 &", "sudo systemctl restart omc"); err != nil { return err } } diff --git a/src/lib_features/readme.md b/src/lib_features/readme.md index 57a250c..a3853f3 100644 --- a/src/lib_features/readme.md +++ b/src/lib_features/readme.md @@ -1,4 +1,4 @@ # 外层 lib 和 features 粘合层 -- config.go 配置合并: restagent.yaml 文件内容，主要是数据库配置 +- config.go 配置合并: omc.yaml 文件内容，主要是数据库配置 diff --git a/src/modules/network_element/controller/action.go b/src/modules/network_element/controller/action.go index 13ee7d4..3997abf 100644 --- a/src/modules/network_element/controller/action.go +++ b/src/modules/network_element/controller/action.go @@ -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" diff --git a/src/modules/network_element/service/ne_license.impl.go b/src/modules/network_element/service/ne_license.impl.go index 8cd4698..fa64b78 100644 --- a/src/modules/network_element/service/ne_license.impl.go +++ b/src/modules/network_element/service/ne_license.impl.go @@ -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) } diff --git a/src/modules/network_element/service/ne_version.impl.go b/src/modules/network_element/service/ne_version.impl.go index 272443d..31737c3 100644 --- a/src/modules/network_element/service/ne_version.impl.go +++ b/src/modules/network_element/service/ne_version.impl.go @@ -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后安装 diff --git a/src/modules/nms_cxy/service/config.impl.go b/src/modules/nms_cxy/service/config.impl.go index b8b5cdf..93aa9c4 100644 --- a/src/modules/nms_cxy/service/config.impl.go +++ b/src/modules/nms_cxy/service/config.impl.go @@ -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" }