From 1abe398c7aa1297d1a6aac982187399b2a40e549 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Tue, 3 Dec 2024 15:20:06 -0600 Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Context=20not=20Cotext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cli/context/signal.go | 6 +++++- cmd/convids/main.go | 3 +-- cmd/cool-down/main.go | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cli/context/signal.go b/cli/context/signal.go index cf8f620..0edd75b 100644 --- a/cli/context/signal.go +++ b/cli/context/signal.go @@ -7,7 +7,11 @@ import ( "syscall" ) -func SelfCancelingCotext(ctx context.Context) (context.Context, context.CancelFunc) { +func SelfCancelingContextFromBackground() (context.Context, context.CancelFunc) { + return SelfCancelingContext(context.Background()) +} + +func SelfCancelingContext(ctx context.Context) (context.Context, context.CancelFunc) { c, done := context.WithCancel(ctx) ch := make(chan os.Signal, 1) signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM) diff --git a/cmd/convids/main.go b/cmd/convids/main.go index d938934..b8b82ac 100644 --- a/cmd/convids/main.go +++ b/cmd/convids/main.go @@ -1,7 +1,6 @@ package main import ( - "context" "fmt" "os" @@ -26,7 +25,7 @@ func main() { os.Exit(2) } - ctx, done := c.SelfCancelingCotext(context.Background()) + ctx, done := c.SelfCancelingContextFromBackground() defer done() var walker convids.ShowWalker diff --git a/cmd/cool-down/main.go b/cmd/cool-down/main.go index 234a06a..29efed5 100644 --- a/cmd/cool-down/main.go +++ b/cmd/cool-down/main.go @@ -10,7 +10,7 @@ import ( ) func main() { - ctx, done := c.SelfCancelingCotext(context.Background()) + ctx, done := c.SelfCancelingContext(context.Background()) defer done() ctx = chill.Chill(ctx) s := spin.Spin(ctx, "Waiting for CPU to cool...")