zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ Agent ] [ Base ] - add support for centos/openeuler ; todo chronyToMasterExec centos

Browse Source
This commit is contained in:
zeaslity
2024-01-19 18:34:36 +08:00
parent 7b57a2a422
commit 42dee262cf
7 changed files with 290 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
agent-go/executor/InitFunction.go
View File

@@ -7,7 +7,7 @@ import (
"strings"
)
func BuildAgentOsOperator(ossOfflinePrefix string) *AgentOsOperator {
func BuildAgentOsOperator(agentInfo *status.AgentInfo, ossOfflinePrefix string) *AgentOsOperator {
AgentOsOperatorCache = &AgentOsOperator{
InstallCommandPrefix: []string{
@@ -25,7 +25,7 @@ func BuildAgentOsOperator(ossOfflinePrefix string) *AgentOsOperator {
}
// os type
detectByAgentStatusInfo(AgentOsOperatorCache)
detectByAgentStatusInfo(agentInfo, AgentOsOperatorCache)
// internet
detectByInternet(AgentOsOperatorCache)
@@ -33,8 +33,11 @@ func BuildAgentOsOperator(ossOfflinePrefix string) *AgentOsOperator {
return AgentOsOperatorCache
}
func detectByAgentStatusInfo(os *AgentOsOperator) {
agentInfo := status.ReportAgentInfo()
func detectByAgentStatusInfo(agentInfo *status.AgentInfo, os *AgentOsOperator) {
if agentInfo == nil {
log.WarnF("[detectByAgentStatusInfo] - agentInfo from status module is nil, roll back to traditional way!")
// detectByOsType()
}
bytes, _ := json.Marshal(agentInfo)
log.DebugF("[detectByAgentStatusInfo] - agent info is => %s", string(bytes))