From d5703dce3939834cae8f3f8e183767d628a6b769 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Fri, 5 Aug 2022 18:13:09 +0200 Subject: [PATCH] internal: fix outposts not reacting to signals while starting Signed-off-by: Jens Langhammer --- cmd/ldap/server.go | 9 +++++++-- cmd/proxy/server.go | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cmd/ldap/server.go b/cmd/ldap/server.go index 80b55b988..7b189559e 100644 --- a/cmd/ldap/server.go +++ b/cmd/ldap/server.go @@ -52,11 +52,18 @@ func main() { ex := common.Init() defer common.Defer() + go func() { + for { + <-ex + os.Exit(0) + } + }() ac := ak.NewAPIController(*akURLActual, akToken) if ac == nil { os.Exit(1) } + defer ac.Shutdown() ac.Server = ldap.NewServer(ac) @@ -67,7 +74,5 @@ func main() { for { <-ex - ac.Shutdown() - os.Exit(0) } } diff --git a/cmd/proxy/server.go b/cmd/proxy/server.go index bcf806f32..cd0074405 100644 --- a/cmd/proxy/server.go +++ b/cmd/proxy/server.go @@ -55,11 +55,18 @@ func main() { ex := common.Init() defer common.Defer() + go func() { + for { + <-ex + os.Exit(0) + } + }() ac := ak.NewAPIController(*akURLActual, akToken) if ac == nil { os.Exit(1) } + defer ac.Shutdown() ac.Server = proxyv2.NewProxyServer(ac) @@ -70,7 +77,5 @@ func main() { for { <-ex - ac.Shutdown() - os.Exit(0) } }