github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-18 11:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #508 from weaveworks/506-conntrack-error

Browse Source 
Don't fail if there are no existing NAT mappings.
This commit is contained in:
Tom Wilkie
2015-09-23 16:00:30 +08:00
parent 5f82478452 b9ffca42e5
commit e620699201
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
probe/endpoint/conntrack.go
+3 -4
View File
@@ -194,10 +194,9 @@ func (c *Conntracker) existingConnections(args ...string) ([]Flow, error) {
}
}()
var result conntrack
if err := xml.NewDecoder(stdout).Decode(&result); err != nil {
if err == io.EOF {
return []Flow{}, err
}
if err := xml.NewDecoder(stdout).Decode(&result); err == io.EOF {
return []Flow{}, nil
} else if err != nil {
return []Flow{}, err
}
return result.Flows, nil