7 files changed, 11 insertions(+), 10 deletions(-)

M auth/bearer.go
M auth/middleware.go
M email/worker.go
M server/email.go
M server/server.go
M webhooks/legacy.go
M webhooks/queue.go

@@ 47,7 47,7 @@ func (bt *BearerToken) Encode() string {
 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 @@ func DecodeBearerToken(token string) *BearerToken {
 	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 {

@@ 519,7 519,7 @@ func OAuth2(token string, hash [64]byte, w http.ResponseWriter,
 		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 @@ func OAuth2(token string, hash [64]byte, w http.ResponseWriter,
 		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)

@@ 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) {

@@ 20,6 20,7 @@ import (
 // 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

@@ 154,7 154,7 @@ func (server *Server) WithDefaultMiddleware() *Server {
 	}
 	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

@@ 205,7 205,7 @@ func deliverPayload(ctx context.Context, name, url string,
 		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 @@ func deliverPayload(ctx context.Context, name, url string,
 	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)
 	}
 

@@ 209,7 209,7 @@ func (queue *WebhookQueue) deliverPayload(ctx context.Context,
 		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 @@ func (queue *WebhookQueue) deliverPayload(ctx context.Context,
 	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)
 	}