overflow_backup_2018_0455/ssh_crawler
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
insanity
2017-10-25 17:37:32 +09:00
parent 87ae90959a
commit d75e100746
5 changed files with 73 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stat/disk_io.go
View File

@@ -28,7 +28,7 @@ func (diskio DiskIOStat) Command() string {
return "cat /proc/diskstats"
}
func (diskio DiskIOStat) Read(r io.Reader, keys []string) (*map[string]string, error) {
func (diskio DiskIOStat) Read(r io.Reader, keys []string) (interface{}, error) {
var (
stats = []DiskIOStat{}
scanner = bufio.NewScanner(r)
@@ -59,6 +59,10 @@ func (diskio DiskIOStat) Read(r io.Reader, keys []string) (*map[string]string, e
})
}
if keys == nil {
return &stats, nil
}
res, err :=diskio.parse(keys, stats)
if err != nil {
return nil, err

6
stat/network.go
View File

@@ -34,7 +34,7 @@ func (net *NetDevStat) Command() string {
return "cat /proc/net/dev"
}
func (net *NetDevStat) Read(r io.Reader, keys []string) (*map[string]string, error) {
func (net *NetDevStat) Read(r io.Reader, keys []string) (interface{}, error) {
var (
scanner = bufio.NewScanner(r)
procNetDevFieldSep = regexp.MustCompile("[ :] *")
@@ -78,6 +78,10 @@ func (net *NetDevStat) Read(r io.Reader, keys []string) (*map[string]string, err
})
}
if keys == nil {
return &stats, nil
}
res, err := net.parse(keys, stats)
if err != nil {
return nil, err