This is an automated email from the ASF dual-hosted git repository.

tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new 5684cea  fix: fix error check lint errors (#204)
5684cea is described below

commit 5684ceaa49d3d55e104ca5eeb00281b45d957c1f
Author: rootlh <302824...@qq.com>
AuthorDate: Mon Jan 25 15:41:38 2021 +0800

    fix: fix error check lint errors (#204)
---
 cmd/ingress/ingress_test.go          |  4 +++-
 pkg/ingress/controller/controller.go | 26 ++++++++++++++++++--------
 pkg/seven/state/service_worker.go    |  4 +++-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/cmd/ingress/ingress_test.go b/cmd/ingress/ingress_test.go
index 473c367..6d6d78a 100644
--- a/cmd/ingress/ingress_test.go
+++ b/cmd/ingress/ingress_test.go
@@ -83,7 +83,9 @@ func TestSignalHandler(t *testing.T) {
        })
        waitCh := make(chan struct{})
        go func() {
-               cmd.Execute()
+               if err := cmd.Execute(); err != nil {
+                       log.Errorf("failed to execute command: %s", err)
+               }
                close(waitCh)
        }()
 
diff --git a/pkg/ingress/controller/controller.go 
b/pkg/ingress/controller/controller.go
index 5f1805c..2669638 100644
--- a/pkg/ingress/controller/controller.go
+++ b/pkg/ingress/controller/controller.go
@@ -285,7 +285,9 @@ func (api6 *Api6Controller) ApisixRoute(controller 
*Controller) {
                api6.Api6ClientSet,
                api6.SharedInformerFactory.Apisix().V1().ApisixRoutes(),
                controller)
-       arc.Run(api6.Stop)
+       if err := arc.Run(api6.Stop); err != nil {
+               log.Errorf("failed to run ApisixRouteController: %s", err)
+       }
 }
 
 func (api6 *Api6Controller) ApisixUpstream(controller *Controller) {
@@ -294,29 +296,37 @@ func (api6 *Api6Controller) ApisixUpstream(controller 
*Controller) {
                api6.Api6ClientSet,
                api6.SharedInformerFactory.Apisix().V1().ApisixUpstreams(),
                controller)
-       auc.Run(api6.Stop)
+       if err := auc.Run(api6.Stop); err != nil {
+               log.Errorf("failed to run ApisixUpstreamController: %s", err)
+       }
 }
 
 func (api6 *Api6Controller) ApisixService(controller *Controller) {
-       auc := BuildApisixServiceController(
+       asc := BuildApisixServiceController(
                api6.KubeClientSet,
                api6.Api6ClientSet,
                api6.SharedInformerFactory.Apisix().V1().ApisixServices(),
                controller)
-       auc.Run(api6.Stop)
+       if err := asc.Run(api6.Stop); err != nil {
+               log.Errorf("failed to run ApisixServiceController: %s", err)
+       }
 }
 
 func (api6 *Api6Controller) ApisixTLS(controller *Controller) {
-       auc := BuildApisixTlsController(
+       atc := BuildApisixTlsController(
                api6.KubeClientSet,
                api6.Api6ClientSet,
                api6.SharedInformerFactory.Apisix().V1().ApisixTLSs(),
                controller)
-       auc.Run(api6.Stop)
+       if err := atc.Run(api6.Stop); err != nil {
+               log.Errorf("failed to run ApisixTlsController: %s", err)
+       }
 }
 
 func (api6 *Api6Controller) Endpoint(controller *Controller) {
-       auc := BuildEndpointController(api6.KubeClientSet, controller)
+       ec := BuildEndpointController(api6.KubeClientSet, controller)
        //conf.EndpointsInformer)
-       auc.Run(api6.Stop)
+       if err := ec.Run(api6.Stop); err != nil {
+               log.Errorf("failed to run EndpointController: %s", err)
+       }
 }
diff --git a/pkg/seven/state/service_worker.go 
b/pkg/seven/state/service_worker.go
index 9ad1abe..8e19234 100644
--- a/pkg/seven/state/service_worker.go
+++ b/pkg/seven/state/service_worker.go
@@ -44,7 +44,9 @@ func (w *serviceWorker) start(rwg *RouteWorkerGroup) {
                for {
                        select {
                        case event := <-w.Event:
-                               w.trigger(event, rwg)
+                               if err := w.trigger(event, rwg); err != nil {
+                                       log.Errorf("failed to trigger event: 
%s", err)
+                               }
                        case <-w.Ctx.Done():
                                return
                        }

Reply via email to