From 95ec463f26499684718f59f45fa56e2da2be9fe3 Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sat, 28 Sep 2024 11:49:32 -0700 Subject: [PATCH] chore: fix linter warnings (#530) Signed-off-by: James Hillyerd --- pkg/server/pop3/listener.go | 4 ++-- pkg/server/smtp/handler_test.go | 2 +- pkg/server/smtp/listener.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/server/pop3/listener.go b/pkg/server/pop3/listener.go index 922775b..4c73702 100644 --- a/pkg/server/pop3/listener.go +++ b/pkg/server/pop3/listener.go @@ -97,8 +97,8 @@ func (s *Server) serve(ctx context.Context) { } else { tempDelay *= 2 } - if max := 1 * time.Second; tempDelay > max { - tempDelay = max + if maxDelay := 1 * time.Second; tempDelay > maxDelay { + tempDelay = maxDelay } log.Error().Str("module", "pop3").Err(err). Msgf("POP3 accept timout; retrying in %v", tempDelay) diff --git a/pkg/server/smtp/handler_test.go b/pkg/server/smtp/handler_test.go index ac3eb78..b0681c5 100644 --- a/pkg/server/smtp/handler_test.go +++ b/pkg/server/smtp/handler_test.go @@ -486,7 +486,7 @@ func playScriptAgainst(t *testing.T, c *textproto.Conn, script []scriptStep) { t.Helper() for i, step := range script { - id, err := c.Cmd(step.send) + id, err := c.Cmd("%s", step.send) if err != nil { t.Fatalf("Step %d, failed to send %q: %v", i, step.send, err) } diff --git a/pkg/server/smtp/listener.go b/pkg/server/smtp/listener.go index b8d7e10..8301767 100644 --- a/pkg/server/smtp/listener.go +++ b/pkg/server/smtp/listener.go @@ -154,8 +154,8 @@ func (s *Server) serve(ctx context.Context) { } else { tempDelay *= 2 } - if max := 1 * time.Second; tempDelay > max { - tempDelay = max + if maxDelay := 1 * time.Second; tempDelay > maxDelay { + tempDelay = maxDelay } log.Error().Str("module", "smtp").Err(err). Msgf("SMTP accept timeout; retrying in %v", tempDelay)