6 files changed, 11 insertions, 6 deletions
diff --git a/cmd/check/main.go b/cmd/check/main.go
index 5a00781..a6a8fa3 100644
--- a/cmd/check/main.go
+++ b/cmd/check/main.go
@@ -31,7 +31,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	logger.Configure(config)
+	logCloser := logger.Configure(config)
+	defer logCloser.Close()
 
 	cmd, err := command.New(executable, os.Args[1:], sshenv.Env{}, config, readWriter)
 	if err != nil {
diff --git a/cmd/gitlab-shell-authorized-keys-check/main.go b/cmd/gitlab-shell-authorized-keys-check/main.go
index 0fc7ecc..81937a7 100644
--- a/cmd/gitlab-shell-authorized-keys-check/main.go
+++ b/cmd/gitlab-shell-authorized-keys-check/main.go
@@ -32,7 +32,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	logger.Configure(config)
+	logCloser := logger.Configure(config)
+	defer logCloser.Close()
 
 	cmd, err := command.New(executable, os.Args[1:], sshenv.Env{}, config, readWriter)
 	if err != nil {
diff --git a/cmd/gitlab-shell-authorized-principals-check/main.go b/cmd/gitlab-shell-authorized-principals-check/main.go
index bdff1d3..8d0aba8 100644
--- a/cmd/gitlab-shell-authorized-principals-check/main.go
+++ b/cmd/gitlab-shell-authorized-principals-check/main.go
@@ -32,7 +32,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	logger.Configure(config)
+	logCloser := logger.Configure(config)
+	defer logCloser.Close()
 
 	cmd, err := command.New(executable, os.Args[1:], sshenv.Env{}, config, readWriter)
 	if err != nil {
diff --git a/cmd/gitlab-shell/main.go b/cmd/gitlab-shell/main.go
index 16705eb..e139ab7 100644
--- a/cmd/gitlab-shell/main.go
+++ b/cmd/gitlab-shell/main.go
@@ -46,7 +46,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	logger.Configure(config)
+	logCloser := logger.Configure(config)
+	defer logCloser.Close()
 
 	env := sshenv.NewFromEnv()
 	cmd, err := command.New(executable, os.Args[1:], env, config, readWriter)
diff --git a/cmd/gitlab-sshd/acceptance_test.go b/cmd/gitlab-sshd/acceptance_test.go
index 7cb1c48..922ee5e 100644
--- a/cmd/gitlab-sshd/acceptance_test.go
+++ b/cmd/gitlab-sshd/acceptance_test.go
@@ -229,7 +229,7 @@ func startSSHD(t *testing.T, dir string) string {
 	t.Cleanup(func() { pw.Close() })
 
 	scanner := bufio.NewScanner(pr)
-	extractor := regexp.MustCompile(`tcp_address="([0-9a-f\[\]\.:]+)"`)
+	extractor := regexp.MustCompile(`"tcp_address":"([0-9a-f\[\]\.:]+)"`)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	cmd := exec.CommandContext(ctx, sshdPath, "-config-dir", dir)
diff --git a/cmd/gitlab-sshd/main.go b/cmd/gitlab-sshd/main.go
index 78690b0..5bbf221 100644
--- a/cmd/gitlab-sshd/main.go
+++ b/cmd/gitlab-sshd/main.go
@@ -63,7 +63,8 @@ func main() {
 
 	cfg.ApplyGlobalState()
 
-	logger.ConfigureStandalone(cfg)
+	logCloser := logger.ConfigureStandalone(cfg)
+	defer logCloser.Close()
 
 	ctx, finished := command.Setup("gitlab-sshd", cfg)
 	defer finished()