Open platform to collect and prioritize feedback
fix: supress context.Canceled errors
goenningd3a7396656eb
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.goindex d7fb39560..a5df5dfb3 100644--- a/app/middlewares/setup.go+++ b/app/middlewares/setup.go@@ -25,14 +25,22 @@ func WorkerSetup() worker.MiddlewareFunc {})logFinish := func(state string, err error) {- if err != nil {- log.Error(c, err)- }+ elapsedMs := time.Since(start).Nanoseconds() / int64(time.Millisecond)+ if errors.Cause(err) == context.Canceled {+ log.Infof(c, "Task '@{TaskName:magenta}' was canceled after @{ElapsedMs:magenta}ms", dto.Props{+ "State": state,+ "TaskName": c.TaskName(),+ "ElapsedMs": elapsedMs,+ })+ return+ }++ log.Error(c, err)log.Infof(c, "Task '@{TaskName:magenta}' finished in @{ElapsedMs:magenta}ms (@{State})", dto.Props{"State": state,"TaskName": c.TaskName(),- "ElapsedMs": time.Since(start).Nanoseconds() / int64(time.Millisecond),+ "ElapsedMs": elapsedMs,})}@@ -63,11 +71,6 @@ func WorkerSetup() worker.MiddlewareFunc {//No errors, so try to commit itif err = trx.Commit(); err != nil {- if errors.Cause(err) == context.Canceled {- logFinish("canceled", nil)- return err- }-logFinish("commit_error", err)return err}@@ -90,6 +93,17 @@ func WebSetup() web.MiddlewareFunc {})logFinish := func(state string, err error) {+ elapsedMs := time.Since(c.Request.StartTime).Nanoseconds() / int64(time.Millisecond)++ if errors.Cause(err) == context.Canceled {+ log.Infof(c, "@{HttpMethod:magenta} @{URL:magenta} was canceled after @{ElapsedMs:magenta}ms", dto.Props{+ "HttpMethod": c.Request.Method,+ "URL": c.Request.URL.String(),+ "ElapsedMs": elapsedMs,+ })+ return+ }+if err != nil {log.Error(c, err)}@@ -99,7 +113,7 @@ func WebSetup() web.MiddlewareFunc {"HttpMethod": c.Request.Method,"StatusCode": c.ResponseStatusCode,"URL": c.Request.URL.String(),- "ElapsedMs": time.Since(c.Request.StartTime).Nanoseconds() / int64(time.Millisecond),+ "ElapsedMs": elapsedMs,})}@@ -130,11 +144,6 @@ func WebSetup() web.MiddlewareFunc {//No errors, so try to commit itif err := c.Commit(); err != nil {- if errors.Cause(err) == context.Canceled {- logFinish("canceled", nil)- return err- }-logFinish("commit_error", err)return err}diff --git a/app/middlewares/setup_test.go b/app/middlewares/setup_test.goindex ad79955fe..099b6e8d3 100644--- a/app/middlewares/setup_test.go+++ b/app/middlewares/setup_test.go@@ -57,7 +57,7 @@ func TestWebSetup_Panic(t *testing.T) {Expect(status).Equals(http.StatusInternalServerError)}-func TestWorkerSetup_Logging_Success(t *testing.T) {+func TestWebSetup_Logging_Success(t *testing.T) {RegisterT(t)var infoLogs []*cmd.LogInfo@@ -89,7 +89,37 @@ func TestWorkerSetup_Logging_Success(t *testing.T) {Expect(errorLogs).HasLen(0)}-func TestWorkerSetup_Logging_Error(t *testing.T) {+func TestWebSetup_Logging_RequestCanceled(t *testing.T) {+ RegisterT(t)++ var infoLogs []*cmd.LogInfo+ bus.AddListener(func(ctx context.Context, q *cmd.LogInfo) error {+ infoLogs = append(infoLogs, q)+ return nil+ })++ var errorLogs []*cmd.LogError+ bus.AddListener(func(ctx context.Context, q *cmd.LogError) error {+ errorLogs = append(errorLogs, q)+ return nil+ })++ server := mock.NewServer()+ server.Use(middlewares.WebSetup())+ status, _ := server.Execute(func(c *web.Context) error {+ return context.Canceled+ })++ Expect(status).Equals(http.StatusOK)++ Expect(infoLogs).HasLen(2)+ Expect(infoLogs[0].Message).Equals("@{HttpMethod:magenta} @{URL:magenta} started for @{ClientIP:magenta}")+ Expect(infoLogs[1].Message).Equals("@{HttpMethod:magenta} @{URL:magenta} was canceled after @{ElapsedMs:magenta}ms")++ Expect(errorLogs).HasLen(0)+}++func TestWebSetup_Logging_Error(t *testing.T) {RegisterT(t)var infoLogs []*cmd.LogInfo