Received: from mail.netlandish.com (mail.netlandish.com [174.136.98.166]) by code.netlandish.com (Postfix) with ESMTP id F34702D7 for <~netlandish/links-dev@lists.code.netlandish.com>; Fri, 18 Apr 2025 18:55:40 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.128.170; helo=mail-yw1-f170.google.com; envelope-from=peter@netlandish.com; receiver= Authentication-Results: mail.netlandish.com; dkim=pass (1024-bit key; unprotected) header.d=netlandish.com header.i=@netlandish.com header.b=qsYKEfjF Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by mail.netlandish.com (Postfix) with ESMTP id 531361D642E for <~netlandish/links-dev@lists.code.netlandish.com>; Fri, 18 Apr 2025 18:55:50 +0000 (UTC) Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-6fda22908d9so15163157b3.1 for <~netlandish/links-dev@lists.code.netlandish.com>; Fri, 18 Apr 2025 11:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netlandish.com; s=google; t=1745002549; x=1745607349; darn=lists.code.netlandish.com; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0I1yZEkhlcBkdbeb9fwH4dVH02c9ZWiy566/bk1cSiI=; b=qsYKEfjFZ35h1d5MhH99Qmqx9x/XxkUWnlm2Su9Hzx0JnmQrjkoGpehpDph9xOtdg6 naBqECxgfEGAqk29CP4U0S+zK9K1UeSxhs2PCiGi+LCXSSXgm8IyNBgs+yIa5IxOrXhZ F48yHWrzpAKHctWTohlBKUH+5uDKzL98yDi2Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745002549; x=1745607349; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0I1yZEkhlcBkdbeb9fwH4dVH02c9ZWiy566/bk1cSiI=; b=cywvFX3+KhAT7T0XUTDJllk/QzFTH4bdQOTarWPV2seOWfStl19O6ne0EDfJ+L4z73 O5qMHH/OVVHEEaRwafWitZ8/HqvRzP3GaJs585jqXG7fM2oQ8Fpjv3wRIQD4Pl7ic6Xe DY734ZQA3i06BG9cOiA0kkXCIiSHliDOQidzEIO/Nu9ZRqQoejI2zraAPKIJXv9udEvv xUKjWadXx8yVh24dS/6Ist7EkyqxU44kPddQm3pWM5LWS/ysKw0HG9CltgmXZW3Qfwmt wvORwM4A40eoEtKfoXBlOV2aTZVWBRqPUDEQWC5+IlXKFiqFDPdhumpQM21DLB2ptipN wfBQ== X-Gm-Message-State: AOJu0YxPaJXHEQ6x5QAVm6K9A5F++Ga2Z7NPoPb6oJfqdbZBVcAtC/lT ZCgxMk8P8ywOAqSb1WV60DggrN21zi9mAnrXKDwH2kSmVq1AMDLUGY5BX/qq7OesVLxMAWz93z0 rCD0= X-Gm-Gg: ASbGnctzVgrPblifcd+C9OIfN29OqXX0rPzlxOyZsTXWjELM2VVFPyABCRSuV7lXsRL fhJALDKYR/snoQPvQFsQSidGaNxQ4Dz0swmPwRv1/0t2Fyzar9CJE9mFzLiZ6zgxr8hNcMIGPLP Icxwr5lYTy3p/8Cqhizvs9sgy6015/y7w+wT+ST63UptpmhXbrNjTLqVs6c7VRWV0jh8AyMSlsp 3GZI4Oxmse15h8Cn+P3cUsKNA+2mafk44lZy7j6/iUkdYEV6E+1WlaJlRmvEbzFba0pMBIghDsn TlOjMyhhuFu++GrDUIIt5ty/vxB7feyRLY1cP7Y= X-Google-Smtp-Source: AGHT+IGtj93f0oFocDDboNn4hmXTQhc9ZaltQeh6daxJA2Sd3NLIm4LoeueytkWFLeLPlgHlPIfpKw== X-Received: by 2002:a81:f90d:0:b0:706:cc34:dab8 with SMTP id 00721157ae682-706ccd1b9aamr39904717b3.22.1745002549297; Fri, 18 Apr 2025 11:55:49 -0700 (PDT) Received: from localhost ([2803:2d60:1107:87f:1e:2d9a:aa74:b8b2]) by smtp.gmail.com with ESMTPSA id 00721157ae682-706ca573a18sm6368967b3.119.2025.04.18.11.55.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 11:55:48 -0700 (PDT) From: Peter Sanchez To: ~netlandish/links-dev@lists.code.netlandish.com Cc: Peter Sanchez Subject: [PATCH links] Fix long delay when shutting down server Date: Fri, 18 Apr 2025 12:55:41 -0600 Message-ID: <20250418185546.1826-1-peter@netlandish.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- cmd/links/main.go | 2 +- cmd/links/parse.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/links/main.go b/cmd/links/main.go index 2e26c81..b8d7ade 100644 --- a/cmd/links/main.go +++ b/cmd/links/main.go @@ -396,12 +396,12 @@ func run() error { ) ctx, cancel := context.WithCancel(context.Background()) - defer cancel() wg := new(sync.WaitGroup) wg.Add(1) go parseBaseURLs(ctx, srv, wg.Done) srv.Run() + cancel() wg.Wait() return nil diff --git a/cmd/links/parse.go b/cmd/links/parse.go index 600d8eb..8bec3ff 100644 --- a/cmd/links/parse.go +++ b/cmd/links/parse.go @@ -81,7 +81,6 @@ func parseBaseURLs(ctx context.Context, srv *server.Server, done func()) { for { select { case <-ctx.Done(): - cancel() fmt.Println("parseBaseURLs: Context canceled, shutting down.") return case <-ticker.C: -- 2.47.2