fix linter issue

Signed-off-by: Nikita Skrynnik <nikita.skrynnik@xored.com>
networkservicemesh · Feb 22, 2022 · 335f71c · 335f71c
1 parent 23c70b9
commit 335f71c
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/pkg/networkservice/common/discoverforwarder/server.go b/pkg/networkservice/common/discoverforwarder/server.go
@@ -98,22 +98,23 @@ func (d *discoverForwarderServer) Request(ctx context.Context, request *networks
 		}
 
 		for _, candidate := range nses {
-			if candidate.Name == datapathForwarder {
-				u, err := url.Parse(candidate.Url)
-
-				if err != nil {
-					logger.Errorf("can not parse forwarder=%v url=%v error=%v", nses[0].Name, u, err.Error())
-					return nil, errors.WithStack(err)
-				}
-
-				conn, err := next.Server(ctx).Request(clienturlctx.WithClientURL(ctx, u), request)
-				if err != nil {
-					continue
-				}
-				storeForwarderName(ctx, candidate.Name)
+			if candidate.Name != datapathForwarder {
+				continue
+			}
+
+			u, err := url.Parse(candidate.Url)
+
+			if err != nil {
+				logger.Errorf("can not parse forwarder=%v url=%v error=%v", candidate.Name, u, err.Error())
+				return nil, errors.WithStack(err)
+			}
 
-				return conn, err
+			resp, err := next.Server(ctx).Request(clienturlctx.WithClientURL(ctx, u), request)
+			if err == nil {
+				storeForwarderName(ctx, candidate.Name)
+				return resp, nil
 			}
+			return nil, err
 		}
 
 		if len(nses) == 0 {