lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resources: Re-order send/recv display messages.

Browse Source 
The updated order is more logical, and follows the time sequence.
This commit is contained in:
James Shubin
2016-12-06 14:42:06 -05:00
parent 6edb5c30d5
commit eb545e75fb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/sendrecv.go
View File

@@ -148,7 +148,7 @@ func (obj *BaseRes) SendRecv(res Res) (map[string]bool, error) {
// i think we probably want the same kind, at least for now... // i think we probably want the same kind, at least for now...
if kind1 != kind2 { if kind1 != kind2 {
e := fmt.Errorf("Kind mismatch between %s[%s]: %s and %s[%s]: %s", obj.Kind(), obj.GetName(), kind2, v.Res.Kind(), v.Res.GetName(), kind1) e := fmt.Errorf("Kind mismatch between %s[%s]: %s and %s[%s]: %s", v.Res.Kind(), v.Res.GetName(), kind1, obj.Kind(), obj.GetName(), kind2)
err = multierr.Append(err, e) // list of errors err = multierr.Append(err, e) // list of errors
continue continue
} }
@@ -156,7 +156,7 @@ func (obj *BaseRes) SendRecv(res Res) (map[string]bool, error) {
// if the types don't match, we can't use send->recv // if the types don't match, we can't use send->recv
// TODO: do we want to relax this for string -> *string ? // TODO: do we want to relax this for string -> *string ?
if e := TypeCmp(value1, value2); e != nil { if e := TypeCmp(value1, value2); e != nil {
e := errwrap.Wrapf(e, "Type mismatch between %s[%s] and %s[%s]", obj.Kind(), obj.GetName(), v.Res.Kind(), v.Res.GetName()) e := errwrap.Wrapf(e, "Type mismatch between %s[%s] and %s[%s]", v.Res.Kind(), v.Res.GetName(), obj.Kind(), obj.GetName())
err = multierr.Append(err, e) // list of errors err = multierr.Append(err, e) // list of errors
continue continue
} }
@@ -181,7 +181,7 @@ func (obj *BaseRes) SendRecv(res Res) (map[string]bool, error) {
value2.Set(value1) // do it for all types that match value2.Set(value1) // do it for all types that match
updated[k] = true // we updated this key! updated[k] = true // we updated this key!
v.Changed = true // tag this key as updated! v.Changed = true // tag this key as updated!
log.Printf("SendRecv: %s[%s].%s <- %s[%s].%s", obj.Kind(), obj.GetName(), k, v.Res.Kind(), v.Res.GetName(), v.Key) log.Printf("SendRecv: %s[%s].%s -> %s[%s].%s", v.Res.Kind(), v.Res.GetName(), v.Key, obj.Kind(), obj.GetName(), k)
} }
} }
return updated, err return updated, err