diff --git a/agent/conf/config.go b/agent/conf/config.go index c7a97150ff4836ae48588cb1690c08b51186131b..4d232151c2df741195ad1c40181c218e8099b7db 100644 --- a/agent/conf/config.go +++ b/agent/conf/config.go @@ -26,7 +26,7 @@ type ServerConfig struct { Logopts *logger.LogOpts `yaml:"log"` } -const config_type = "config_agent.yaml" +const config_type = "topo_agent.yaml" var Config_dir string diff --git a/scripts/PilotGo-plugin-topology.spec b/scripts/PilotGo-plugin-topology.spec index 369b9fc7ef5648fcde0ce82fe9b0147daec50841..5b4e2877ed187f1441f40808ef68a794fac0a690 100644 --- a/scripts/PilotGo-plugin-topology.spec +++ b/scripts/PilotGo-plugin-topology.spec @@ -44,21 +44,21 @@ GO111MODULE=on go build -mod=vendor -o PilotGo-plugin-topology-agent main.go %install # server install -D -m 0755 server/PilotGo-plugin-topology-server %{buildroot}/opt/PilotGo/plugin/topology/server/PilotGo-plugin-topology-server -install -D -m 0644 conf/config_server.yaml.templete %{buildroot}/opt/PilotGo/plugin/topology/server/config_server.yaml +install -D -m 0644 conf/topo_server.yaml.templete %{buildroot}/opt/PilotGo/plugin/topology/server/topo_server.yaml install -D -m 0644 scripts/PilotGo-plugin-topology-server.service %{buildroot}/usr/lib/systemd/system/PilotGo-plugin-topology-server.service # agent install -D -m 0755 agent/PilotGo-plugin-topology-agent %{buildroot}/opt/PilotGo/plugin/topology/agent/PilotGo-plugin-topology-agent -install -D -m 0644 conf/config_agent.yaml.templete %{buildroot}/opt/PilotGo/plugin/topology/agent/config_agent.yaml +install -D -m 0644 conf/topo_agent.yaml.templete %{buildroot}/opt/PilotGo/plugin/topology/agent/topo_agent.yaml install -D -m 0644 scripts/PilotGo-plugin-topology-agent.service %{buildroot}/usr/lib/systemd/system/PilotGo-plugin-topology-agent.service %files server /opt/PilotGo/plugin/topology/server/PilotGo-plugin-topology-server -/opt/PilotGo/plugin/topology/server/config_server.yaml +/opt/PilotGo/plugin/topology/server/topo_server.yaml /usr/lib/systemd/system/PilotGo-plugin-topology-server.service %files agent /opt/PilotGo/plugin/topology/agent/PilotGo-plugin-topology-agent -/opt/PilotGo/plugin/topology/agent/config_agent.yaml +/opt/PilotGo/plugin/topology/agent/topo_agent.yaml /usr/lib/systemd/system/PilotGo-plugin-topology-agent.service %changelog diff --git a/server/conf/config.go b/server/conf/config.go index 3dc35d7bd4b8b41b2f8b3fb62bab398d73edd6f8..806769f3d1a1b3575a22cc08f9aa868c62162d59 100644 --- a/server/conf/config.go +++ b/server/conf/config.go @@ -42,7 +42,7 @@ type ServerConfig struct { Prometheus *PrometheusConf `yaml:"prometheus"` } -const config_type = "config_server.yaml" +const config_type = "topo_server.yaml" var Config_dir string diff --git a/server/service/background/initdb.go b/server/service/background/initdb.go index 8641cc43fb8361edaf2eb7c8f87cedde7ac42c6c..eb223dd2b6351eb821b45c7fc895cb0a9b0cba75 100644 --- a/server/service/background/initdb.go +++ b/server/service/background/initdb.go @@ -18,7 +18,7 @@ func InitDB() { case "otherDB": default: - err := errors.Errorf("unknown database in config_server.yaml: %s **fatal**4", conf.Global_config.Topo.GraphDB) // err top + err := errors.Errorf("unknown database in topo_server.yaml: %s **fatal**4", conf.Global_config.Topo.GraphDB) // err top agentmanager.Topo.ErrCh <- err agentmanager.Topo.Errmu.Lock() agentmanager.Topo.ErrCond.Wait()