diff --git a/cmd/agent/collector/psutil_collector.go b/cmd/agent/collector/psutil_collector.go index 25df0227b55c7d482227bd090652654efa9aaa34..427bfca5cdf9998df2679fb026484559b313856b 100644 --- a/cmd/agent/collector/psutil_collector.go +++ b/cmd/agent/collector/psutil_collector.go @@ -15,8 +15,6 @@ import ( "github.com/shirou/gopsutil/v3/net" ) -var Psutildata *PsutilCollector - type PsutilCollector struct { Host_1 *global.Host Processes_1 []*global.Process diff --git a/cmd/agent/service/dataCollector.go b/cmd/agent/service/dataCollector.go index 633247e4bfe683dcebda3e19a8500cc10766c172..caf29a5f5f03a926c1971a921e8f6e345adb4bfd 100755 --- a/cmd/agent/service/dataCollector.go +++ b/cmd/agent/service/dataCollector.go @@ -23,8 +23,8 @@ func DataCollectorService() (global.Data_collector, error) { switch datasource { case "gopsutil": - collector.Psutildata = collector.CreatePsutilCollector() - err := collector.Psutildata.Collect_host_data() + psutildata := collector.CreatePsutilCollector() + err := psutildata.Collect_host_data() if err != nil { err = errors.Wrap(err, " ") return nil, err @@ -34,7 +34,7 @@ func DataCollectorService() (global.Data_collector, error) { go func() { defer wg.Done() time_start := time.Now() - err := collector.Psutildata.Collect_process_instant_data() + err := psutildata.Collect_process_instant_data() time_elapse := time.Since(time_start) ch <- &err_and_time{ Err: err, @@ -46,7 +46,7 @@ func DataCollectorService() (global.Data_collector, error) { go func() { defer wg.Done() time_start := time.Now() - err := collector.Psutildata.Collect_netconnection_all_data() + err := psutildata.Collect_netconnection_all_data() time_elapse := time.Since(time_start) ch <- &err_and_time{ Err: err, @@ -58,7 +58,7 @@ func DataCollectorService() (global.Data_collector, error) { go func() { defer wg.Done() time_start := time.Now() - err = collector.Psutildata.Collect_interfaces_io_data() + err = psutildata.Collect_interfaces_io_data() time_elapse := time.Since(time_start) ch <- &err_and_time{ Err: err, @@ -70,7 +70,7 @@ func DataCollectorService() (global.Data_collector, error) { go func() { defer wg.Done() time_start := time.Now() - err = collector.Psutildata.Collect_addrInterfaceMap_data() + err = psutildata.Collect_addrInterfaceMap_data() time_elapse := time.Since(time_start) ch <- &err_and_time{ Err: err, @@ -82,7 +82,7 @@ func DataCollectorService() (global.Data_collector, error) { go func() { defer wg.Done() time_start := time.Now() - err = collector.Psutildata.Collect_disk_data() + err = psutildata.Collect_disk_data() time_elapse := time.Since(time_start) ch <- &err_and_time{ Err: err, @@ -94,7 +94,7 @@ func DataCollectorService() (global.Data_collector, error) { go func() { defer wg.Done() time_start := time.Now() - err = collector.Psutildata.Collect_cpu_data() + err = psutildata.Collect_cpu_data() time_elapse := time.Since(time_start) ch <- &err_and_time{ Err: err, @@ -121,7 +121,7 @@ func DataCollectorService() (global.Data_collector, error) { global.ERManager.ErrorTransmit("service", "debug", errors.New(t), false, false) } - return collector.Psutildata, nil + return psutildata, nil default: return nil, errors.New("wrong data source") }