From 4059a1576bc97879b840ec5200defd80bc9eb3f0 Mon Sep 17 00:00:00 2001 From: Nixevol Date: Wed, 30 Sep 2026 12:12:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B6=88=E9=99=A4=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=8F=98=E9=87=8F=E9=81=AE=E8=94=BD=E4=BB=A5?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/nixmsg/serve.go | 8 ++++---- internal/admin/admin_test.go | 4 ++-- internal/app/identity/register_test.go | 2 +- internal/metrics/sample_test.go | 6 ++++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/nixmsg/serve.go b/cmd/nixmsg/serve.go index 732fc19..0fa3336 100644 --- a/cmd/nixmsg/serve.go +++ b/cmd/nixmsg/serve.go @@ -200,8 +200,8 @@ func runServe(ctx context.Context, cfg config.Config) error { if _, found := brk.ConnInfoOf(endpointID); !found { return false, nil } - if err := sess.Disable(kickCtx, endpointID); err != nil { - return false, err + if disableErr := sess.Disable(kickCtx, endpointID); disableErr != nil { + return false, disableErr } return true, nil }, @@ -209,8 +209,8 @@ func runServe(ctx context.Context, cfg config.Config) error { if _, found := brk.ConnInfoOf(endpointID); !found { return false, nil } - if err := sess.Deleted(kickCtx, endpointID); err != nil { - return false, err + if deleteErr := sess.Deleted(kickCtx, endpointID); deleteErr != nil { + return false, deleteErr } return true, nil }, diff --git a/internal/admin/admin_test.go b/internal/admin/admin_test.go index 9df00ed..49a4118 100644 --- a/internal/admin/admin_test.go +++ b/internal/admin/admin_test.go @@ -304,9 +304,9 @@ func TestAdminLockDoesNotBlockAuthedSession(t *testing.T) { for i := 0; i < 10; i++ { bad := &http.Client{} - res := postJSON(t, bad, base+"/api/admin/login", + res = postJSON(t, bad, base+"/api/admin/login", `{"username":"admin","password":"wrong-password!!"}`, nil) - env := decodeEnv(t, res) + env = decodeEnv(t, res) if i < 9 { if res.StatusCode != 401 { t.Fatalf("fail %d: want 401 got %d %+v", i, res.StatusCode, env) diff --git a/internal/app/identity/register_test.go b/internal/app/identity/register_test.go index 4b7699a..2d992eb 100644 --- a/internal/app/identity/register_test.go +++ b/internal/app/identity/register_test.go @@ -371,7 +371,7 @@ func TestRegisterTrustedProxyClientIPLock(t *testing.T) { locks.Clear(auth.LockKey{Kind: auth.LockRegisterIP, IP: "198.51.100.7"}) locks.Clear(auth.LockKey{Kind: auth.LockRegisterIP, IP: "203.0.113.50"}) for i := 0; i < 10; i++ { - code, resp := post("203.0.113.50:4433", "198.51.100.7", wrong) + code, resp = post("203.0.113.50:4433", "198.51.100.7", wrong) if code != http.StatusForbidden || resp.Error == nil || resp.Error.Code != protocol.CodeRegistrationCodeInvalid { t.Fatalf("untrusted fail #%d: status=%d resp=%+v", i+1, code, resp) } diff --git a/internal/metrics/sample_test.go b/internal/metrics/sample_test.go index 9ca54fd..1d9927f 100644 --- a/internal/metrics/sample_test.go +++ b/internal/metrics/sample_test.go @@ -31,7 +31,8 @@ VALUES ('alice', 'm1', 'endpoint', 'bob', 100, 1, 0, 0, 'dispatched', '', 1, 'te t.Fatal(err) } var seq int64 - if err := db.Write.QueryRowContext(ctx, `SELECT seq FROM messages WHERE id='m1'`).Scan(&seq); err != nil { + err = db.Write.QueryRowContext(ctx, `SELECT seq FROM messages WHERE id='m1'`).Scan(&seq) + if err != nil { t.Fatal(err) } _, err = db.Write.ExecContext(ctx, ` @@ -48,7 +49,8 @@ VALUES ('alice', 'm2', 'endpoint', 'bob', 999999, 0, 0, 0, 'scheduled', '', 1, ' } reg := New() - if err := SampleStoreGauges(ctx, reg, db.Read); err != nil { + err = SampleStoreGauges(ctx, reg, db.Read) + if err != nil { t.Fatal(err) } SampleQueues(reg, 3, 1)