From 47e612f5ffd3e7598be90c5033fca9edb8ff407b Mon Sep 17 00:00:00 2001 From: Trial97 Date: Wed, 20 Mar 2019 09:28:15 +0200 Subject: [PATCH] Removed hasOnlyErrors from brodcast strategy --- dispatchers/libdispatcher.go | 7 ------- dispatchers/responder_it_test.go | 4 ++-- utils/errors.go | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dispatchers/libdispatcher.go b/dispatchers/libdispatcher.go index cf7aa999d..cb4c2e0b0 100644 --- a/dispatchers/libdispatcher.go +++ b/dispatchers/libdispatcher.go @@ -230,7 +230,6 @@ func (ign *singleResultStrategyDispatcher) Dispatch(connIDs []string, conns map[ func (ign *brodcastStrategyDispatcher) Dispatch(connIDs []string, conns map[string]*rpcclient.RpcClientPool, routeID *string, serviceMethod string, args interface{}, reply interface{}) (err error) { var hasErrors bool - var hasOnlyErrors bool = true for _, connID := range connIDs { conn, has := conns[connID] if !has { @@ -245,17 +244,11 @@ func (ign *brodcastStrategyDispatcher) Dispatch(connIDs []string, conns map[stri utils.Logger.Err(fmt.Sprintf("<%s> Network Error at %s strategy for connID %q : %s", utils.DispatcherS, utils.MetaBroadcast, connID, err.Error())) hasErrors = true - continue } else if err != nil { utils.Logger.Err(fmt.Sprintf("<%s> Error at %s strategy for connID %q : %s", utils.DispatcherS, utils.MetaBroadcast, connID, err.Error())) hasErrors = true - continue } - hasOnlyErrors = false - } - if hasOnlyErrors { - return utils.ErrNotExecuted } if hasErrors { // rewrite err if not all call were succesfull return utils.ErrPartiallyExecuted diff --git a/dispatchers/responder_it_test.go b/dispatchers/responder_it_test.go index d4592c8cf..bd7157410 100644 --- a/dispatchers/responder_it_test.go +++ b/dispatchers/responder_it_test.go @@ -177,8 +177,8 @@ func testDspResponderBroadcast(t *testing.T) { allEngine.stopEngine(t) pingReply = "" if err := dispEngine.RCP.Call(utils.ResponderPing, pingEv, &pingReply); err == nil || - err.Error() != utils.ErrNotExecuted.Error() { - t.Errorf("Expected error: %s received error: %v and reply %q", utils.ErrNotExecuted.Error(), err, pingReply) + err.Error() != utils.ErrPartiallyExecuted.Error() { + t.Errorf("Expected error: %s received error: %v and reply %q", utils.ErrPartiallyExecuted.Error(), err, pingReply) } allEngine.startEngine(t) allEngine2.startEngine(t) diff --git a/utils/errors.go b/utils/errors.go index c337a27da..bd9d55bac 100644 --- a/utils/errors.go +++ b/utils/errors.go @@ -51,7 +51,6 @@ var ( ErrResourceUnauthorized = errors.New("RESOURCE_UNAUTHORIZED") ErrNoActiveSession = errors.New("NO_ACTIVE_SESSION") ErrPartiallyExecuted = errors.New("PARTIALLY_EXECUTED") - ErrNotExecuted = errors.New("NOT_EXECUTED") ErrMaxUsageExceeded = errors.New("MAX_USAGE_EXCEEDED") ErrUnallocatedResource = errors.New("UNALLOCATED_RESOURCE") ErrNotFoundNoCaps = errors.New("not found")