From 2ac5ffde2f1d1249b721142dc15a5386ef4d603e Mon Sep 17 00:00:00 2001 From: Thomas Jackson Date: Tue, 29 Jan 2019 12:20:51 -0800 Subject: [PATCH 1/2] Remove TODO --- cmd/katalog-sync-sidecar/main.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/katalog-sync-sidecar/main.go b/cmd/katalog-sync-sidecar/main.go index a806371..aed78b7 100644 --- a/cmd/katalog-sync-sidecar/main.go +++ b/cmd/katalog-sync-sidecar/main.go @@ -15,7 +15,6 @@ import ( katalogsync "github.com/wish/katalog-sync/proto" ) -// TODO: consul flags var opts struct { LogLevel string `long:"log-level" description:"Log level" default:"info"` KatalogSyncEndpoint string `long:"katalog-sync-daemon" description:"katalog-sync-daemon API endpoint"` From 81d462d35550ba7743a24c6fc925d9ce70ba68d4 Mon Sep 17 00:00:00 2001 From: Thomas Jackson Date: Fri, 1 Feb 2019 14:28:42 -0800 Subject: [PATCH 2/2] Force stop after second signal --- cmd/katalog-sync-sidecar/main.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmd/katalog-sync-sidecar/main.go b/cmd/katalog-sync-sidecar/main.go index aed78b7..2a29ff2 100644 --- a/cmd/katalog-sync-sidecar/main.go +++ b/cmd/katalog-sync-sidecar/main.go @@ -104,8 +104,18 @@ WAITLOOP: } } + go func() { + <-sigs + cancel() + }() + // Send deregister request for { + select { + case <-ctx.Done(): + return + default: + } logrus.Infof("deregister attempt") _, err := client.Deregister(ctx, &katalogsync.DeregisterQuery{Namespace: opts.Namespace, PodName: opts.PodName, ContainerName: opts.ContainerName}) if err == nil {