VOL-2001 resolve sca errors
Change-Id: Iee4c814e721437c6f2f0d3387cac92be498ceb99
diff --git a/internal/pkg/afrouter/api.go b/internal/pkg/afrouter/api.go
index 8b72897..1d2360b 100644
--- a/internal/pkg/afrouter/api.go
+++ b/internal/pkg/afrouter/api.go
@@ -50,7 +50,7 @@
if rtrn_err {
return nil, errors.New("Errors in API configuration")
} else {
- var err error = nil
+ var err error
aa := &ArouterApi{addr: config.Addr, port: int(config.Port), ar: ar}
// Create the listener for the API server
if aa.apiListener, err =
@@ -68,13 +68,14 @@
func (aa *ArouterApi) getServer(srvr string) (*server, error) {
if s, ok := aa.ar.servers[srvr]; !ok {
- err := errors.New(fmt.Sprintf("Server '%s' doesn't exist", srvr))
+ err := fmt.Errorf("Server '%s' doesn't exist", srvr)
return nil, err
} else {
return s, nil
}
}
+// nolint: unused
func (aa *ArouterApi) getRouter(s *server, clstr string) (Router, error) {
for _, pkg := range s.routers {
for _, r := range pkg {
@@ -83,7 +84,7 @@
}
}
}
- err := errors.New(fmt.Sprintf("Cluster '%s' doesn't exist", clstr))
+ err := fmt.Errorf("Cluster '%s' doesn't exist", clstr)
return nil, err
}
@@ -95,7 +96,7 @@
}
}
}
- err := errors.New(fmt.Sprintf("Cluster '%s' doesn't exist", clstr))
+ err := fmt.Errorf("Cluster '%s' doesn't exist", clstr)
return nil, err
}
@@ -105,14 +106,14 @@
return b, nil
}
}
- err := errors.New(fmt.Sprintf("Backend '%s' doesn't exist in cluster %s",
- bknd, c.name))
+ err := fmt.Errorf("Backend '%s' doesn't exist in cluster %s",
+ bknd, c.name)
return nil, err
}
func (aa *ArouterApi) getConnection(b *backend, con string) (*connection, error) {
if c, ok := b.connections[con]; !ok {
- err := errors.New(fmt.Sprintf("Connection '%s' doesn't exist", con))
+ err := fmt.Errorf("Connection '%s' doesn't exist", con)
return nil, err
} else {
return c, nil
@@ -142,7 +143,11 @@
log.Debug("Affinity router found")
b := rr.FindBackendCluster(in.Cluster).getBackend(in.Backend)
if b != nil {
- rr.setAffinity(in.Id, b)
+ err := rr.setAffinity(in.Id, b)
+ if err != nil {
+ log.Debugf("Couldn't set affinity: %s", err.Error())
+ return &pb.Result{Success: false, Error: err.Error()}, err
+ }
} else {
log.Errorf("Requested backend '%s' not found", in.Backend)
}
@@ -155,7 +160,8 @@
_ = rr
}
} else {
- log.Debugf("Couldn't get router type")
+ err = errors.New("Couldn't get router type")
+ log.Debugf("%v", err)
return &pb.Result{Success: false, Error: err.Error()}, err
}
@@ -176,7 +182,7 @@
aap := &aa
if s, err = (aap).getServer(in.Server); err != nil {
- err := errors.New(fmt.Sprintf("Server '%s' doesn't exist", in.Server))
+ err := fmt.Errorf("Server '%s' doesn't exist", in.Server)
log.Error(err)
return &pb.Result{Success: false, Error: err.Error()}, err
}