diff --git a/auth/bearer.go b/auth/bearer.go index 27773fac4ae2a6059d4c3903d362fd4130a29210..e5aabaf3aa06abca7ee36a8f19c2df40f7982656 100644 --- a/auth/bearer.go +++ b/auth/bearer.go @@ -47,7 +47,7 @@ func DecodeBearerToken(token string) *BearerToken { payload, err := base64.RawStdEncoding.DecodeString(token) if err != nil { - log.Printf("Invalid bearer token: invalid base64 %e", err) + log.Printf("Invalid bearer token: invalid base64: %v", err) return nil } if len(payload) <= 32 { @@ -66,7 +66,7 @@ var bt BearerToken err = bare.Unmarshal(payload, &bt) if err != nil { - log.Printf("Invalid bearer token: BARE unmarshal failed: %e", err) + log.Printf("Invalid bearer token: BARE unmarshal failed: %v", err) return nil } if bt.Version != TokenVersion { diff --git a/auth/middleware.go b/auth/middleware.go index a82888a67ea48279a40fe8b37e777197180ebba5..e0077941302d53603d04c034c3e5dff2a5fe040e 100644 --- a/auth/middleware.go +++ b/auth/middleware.go @@ -519,7 +519,7 @@ go func() { defer wg.Done() err = LookupUser(r.Context(), bt.Username, &auth) if err != nil { - log.Printf("LookupUser: %e", err) + log.Printf("LookupUser: %v", err) atomic.AddInt32(&tempErr, 1) } else { atomic.AddInt32(&res, 1) @@ -531,7 +531,7 @@ defer wg.Done() isRevoked, err := LookupTokenRevocation(r.Context(), bt.Username, hash, bt.ClientID) if err != nil { - log.Printf("LookupTokenRevocation: %e", err) + log.Printf("LookupTokenRevocation: %v", err) atomic.AddInt32(&tempErr, 1) } else if !isRevoked { atomic.AddInt32(&res, 1) diff --git a/email/worker.go b/email/worker.go index 57f35f6781e566d7da55ce612928b9e66cef2f02..1ebe91c04969e1f6dbea4814b09aef09caeacbbf 100644 --- a/email/worker.go +++ b/email/worker.go @@ -34,7 +34,7 @@ func NewTask(msg *bytes.Buffer, rcpts []string) *work.Task { return work.NewTask(func(ctx context.Context) error { err := Send(ctx, msg, rcpts) if err != nil { - log.Printf("Error sending mail: %e", err) + log.Printf("Error sending mail: %v", err) } return err }).Retries(10).After(func(ctx context.Context, task *work.Task) { diff --git a/server/email.go b/server/email.go index 584d5cb79d3fcfe278ab759b7b6e268ba9d2178f..1a9c8c226f44ed7a38eda5013e2c3e19a989916d 100644 --- a/server/email.go +++ b/server/email.go @@ -20,6 +20,7 @@ // Provides a graphql.RecoverFunc which will print the stack trace, and if // debug mode is not enabled, email it to the administrator. func EmailRecover(ctx context.Context, _origErr interface{}) error { + log.Println(_origErr) var ( ok bool origErr error diff --git a/server/server.go b/server/server.go index 936afcea3d8cd0c861bd29b1b42362ead9c4b187..a8a5f0e80f32c1f010b2f216459e6037849834d2 100644 --- a/server/server.go +++ b/server/server.go @@ -154,7 +154,7 @@ rcs = "redis://" } ropts, err := goRedis.ParseURL(rcs) if err != nil { - log.Fatalf("Invalid sr.ht::redis-host in config.ini: %e", err) + log.Fatalf("Invalid sr.ht::redis-host in config.ini: %v", err) } rc := goRedis.NewClient(ropts) server.redis = rc diff --git a/webhooks/legacy.go b/webhooks/legacy.go index 436203166f75cbf9e8eefb2cfc0bd3edc60823a8..b74e04be4914211ee88fbe3f8f6d9769d316a0bd 100644 --- a/webhooks/legacy.go +++ b/webhooks/legacy.go @@ -205,7 +205,7 @@ req, err := http.NewRequestWithContext(rctx, http.MethodPost, url, bytes.NewReader(payload)) defer cancel() if err != nil { - return fmt.Errorf("http.NewRequestWithContext: %v: %e", + return fmt.Errorf("http.NewRequestWithContext: %v: %w", err, work.ErrDoNotReattempt) } @@ -231,7 +231,7 @@ reader := io.LimitReader(resp.Body, 65536) // No more than 64 KiB body, err := ioutil.ReadAll(reader) if err != nil { - return fmt.Errorf("Error reading response body: %v: %e", + return fmt.Errorf("Error reading response body: %v: %w", err, work.ErrDoNotReattempt) } diff --git a/webhooks/queue.go b/webhooks/queue.go index cd2a99c9c3e0a0f7893c752623ea1ff51775246b..b9c9e9745e13c231bcefd56e37103bb315ad24d0 100644 --- a/webhooks/queue.go +++ b/webhooks/queue.go @@ -209,7 +209,7 @@ req, err := http.NewRequestWithContext(rctx, http.MethodPost, webhook.Subscription.URL, bytes.NewReader(payload)) defer cancel() if err != nil { - return fmt.Errorf("http.NewRequestWithContext: %v: %e", + return fmt.Errorf("http.NewRequestWithContext: %v: %w", err, work.ErrDoNotReattempt) } @@ -232,7 +232,7 @@ reader := io.LimitReader(resp.Body, 262144) // No more than 256 KiB body, err := ioutil.ReadAll(reader) if err != nil { - return fmt.Errorf("Error reading response body: %v: %e", + return fmt.Errorf("Error reading response body: %v: %w", err, work.ErrDoNotReattempt) }