c/bmaas/bmsrv: use clicontext
Change-Id: Idb5e43ef38e1ae294409cf1c99d88426623f824e
Reviewed-on: https://review.monogon.dev/c/monogon/+/1598
Tested-by: Jenkins CI
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
diff --git a/cloud/bmaas/server/cmd/BUILD.bazel b/cloud/bmaas/server/cmd/BUILD.bazel
index 0977a44..3988426 100644
--- a/cloud/bmaas/server/cmd/BUILD.bazel
+++ b/cloud/bmaas/server/cmd/BUILD.bazel
@@ -7,7 +7,10 @@
srcs = ["main.go"],
importpath = "source.monogon.dev/cloud/bmaas/server/cmd",
visibility = ["//visibility:private"],
- deps = ["//cloud/bmaas/server"],
+ deps = [
+ "//cloud/bmaas/server",
+ "//metropolis/cli/pkg/context",
+ ],
)
go_binary(
diff --git a/cloud/bmaas/server/cmd/main.go b/cloud/bmaas/server/cmd/main.go
index 59f6ca6..2d04841 100644
--- a/cloud/bmaas/server/cmd/main.go
+++ b/cloud/bmaas/server/cmd/main.go
@@ -5,6 +5,7 @@
"flag"
"source.monogon.dev/cloud/bmaas/server"
+ clicontext "source.monogon.dev/metropolis/cli/pkg/context"
)
func main() {
@@ -12,10 +13,7 @@
s.Config.RegisterFlags()
flag.Parse()
- ctx, ctxC := context.WithCancel(context.Background())
- // TODO: context cancel on interrupt.
- _ = ctxC
-
+ ctx := clicontext.WithInterrupt(context.Background())
s.Start(ctx)
select {}
}