lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netconfig: prevent duplicate error messages

Browse Source
This commit is contained in:
Michael Stapelberg 2018-06-14 18:28:40 +02:00
parent 03b2345eb2
commit fdd2201ef5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/netconfig/netconfig.go
View File

@ -434,21 +434,26 @@ func Apply(dir, root string) error {
var firstErr error var firstErr error
if err := applyDhcp4(dir); err != nil { if err := applyDhcp4(dir); err != nil {
log.Printf("cannot apply dhcp4 lease: %v", err) if firstErr == nil {
firstErr = fmt.Errorf("dhcp4: %v", err) firstErr = fmt.Errorf("dhcp4: %v", err)
} else {
log.Printf("cannot apply dhcp4 lease: %v", err)
}
} }
if err := applyDhcp6(dir); err != nil { if err := applyDhcp6(dir); err != nil {
log.Printf("cannot apply dhcp6 lease: %v", err)
if firstErr == nil { if firstErr == nil {
firstErr = fmt.Errorf("dhcp6: %v", err) firstErr = fmt.Errorf("dhcp6: %v", err)
} else {
log.Printf("cannot apply dhcp6 lease: %v", err)
} }
} }
if err := applySysctl(); err != nil { if err := applySysctl(); err != nil {
log.Printf("cannot apply sysctl config: %v", err)
if firstErr == nil { if firstErr == nil {
firstErr = fmt.Errorf("sysctl: %v", err) firstErr = fmt.Errorf("sysctl: %v", err)
} else {
log.Printf("cannot apply sysctl config: %v", err)
} }
} }