From 8aa8b72049d66ac164fe3673cea5a35cf84f681d Mon Sep 17 00:00:00 2001 From: Wangjunqi123 Date: Wed, 21 Jun 2023 09:18:15 +0800 Subject: [PATCH] modify getpackageversion(): change cmd to pkgname --- gala-ops/server/agentmanager/command.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gala-ops/server/agentmanager/command.go b/gala-ops/server/agentmanager/command.go index 6d33d553..97fabb1a 100644 --- a/gala-ops/server/agentmanager/command.go +++ b/gala-ops/server/agentmanager/command.go @@ -10,12 +10,12 @@ import ( ) // 获取业务机集群gala-gopher版本信息 -func GetPackageVersion(machines []*database.Agent, batch *common.Batch, cmd string) ([]*database.Agent, error) { - cmdresults, err := Galaops.Sdkmethod.RunCommand(batch, cmd) +func GetPkgVersion(machines []*database.Agent, batch *common.Batch, pkgname string) ([]*database.Agent, error) { + cmdresults, err := Galaops.Sdkmethod.RunCommand(batch, "rpm -qi"+pkgname) if err == nil { for _, result := range cmdresults { if result.RetCode == 1 && strings.Contains(result.Stdout, "is not installed") && result.Stderr == "" { - logger.Error("%s not installed happened when getpackageversion: %s, %s, %s; ", "gala-gopher", result.MachineUUID, result.MachineIP, result.Stderr) + logger.Error("%s not installed happened when getpackageversion: %s, %s, %s; ", pkgname, result.MachineUUID, result.MachineIP, result.Stderr) continue } else if result.RetCode == 127 && result.Stdout == "" && strings.Contains(result.Stderr, "command not found") { logger.Error("rpm not installed when getpackageversion: %s, %s, %s", result.MachineUUID, result.MachineIP, result.Stderr) @@ -33,7 +33,7 @@ func GetPackageVersion(machines []*database.Agent, batch *common.Batch, cmd stri } } } else { - logger.Error("failed to run command: %s in %s, %s, %s when getpackageversion", "rpm -qi gala-gopher", result.MachineUUID, result.MachineIP, result.Stderr) + logger.Error("failed to run command: rpm -qi %s in %s, %s, %s when getpackageversion", pkgname, result.MachineUUID, result.MachineIP, result.Stderr) continue } } -- Gitee