diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/check/main.go | 2 | ||||
| -rw-r--r-- | cmd/gitlab-shell-authorized-keys-check/main.go | 2 | ||||
| -rw-r--r-- | cmd/gitlab-shell-authorized-principals-check/main.go | 2 | ||||
| -rw-r--r-- | cmd/gitlab-shell/main.go | 2 | ||||
| -rw-r--r-- | cmd/gitlab-sshd/main.go | 6 |
5 files changed, 9 insertions, 5 deletions
diff --git a/cmd/check/main.go b/cmd/check/main.go index fbb520b..5a00781 100644 --- a/cmd/check/main.go +++ b/cmd/check/main.go @@ -39,7 +39,7 @@ func main() { os.Exit(1) } - ctx, finished := command.ContextWithCorrelationID() + ctx, finished := command.Setup(executable.Name, config) defer finished() if err = cmd.Execute(ctx); err != nil { diff --git a/cmd/gitlab-shell-authorized-keys-check/main.go b/cmd/gitlab-shell-authorized-keys-check/main.go index 8746353..0fc7ecc 100644 --- a/cmd/gitlab-shell-authorized-keys-check/main.go +++ b/cmd/gitlab-shell-authorized-keys-check/main.go @@ -42,7 +42,7 @@ func main() { os.Exit(1) } - ctx, finished := command.ContextWithCorrelationID() + ctx, finished := command.Setup(executable.Name, config) defer finished() if err = cmd.Execute(ctx); err != nil { diff --git a/cmd/gitlab-shell-authorized-principals-check/main.go b/cmd/gitlab-shell-authorized-principals-check/main.go index f14fbde..bdff1d3 100644 --- a/cmd/gitlab-shell-authorized-principals-check/main.go +++ b/cmd/gitlab-shell-authorized-principals-check/main.go @@ -42,7 +42,7 @@ func main() { os.Exit(1) } - ctx, finished := command.ContextWithCorrelationID() + ctx, finished := command.Setup(executable.Name, config) defer finished() if err = cmd.Execute(ctx); err != nil { diff --git a/cmd/gitlab-shell/main.go b/cmd/gitlab-shell/main.go index 8286e66..16705eb 100644 --- a/cmd/gitlab-shell/main.go +++ b/cmd/gitlab-shell/main.go @@ -57,7 +57,7 @@ func main() { os.Exit(1) } - ctx, finished := command.ContextWithCorrelationID() + ctx, finished := command.Setup(executable.Name, config) defer finished() if err = cmd.Execute(ctx); err != nil { diff --git a/cmd/gitlab-sshd/main.go b/cmd/gitlab-sshd/main.go index f777b9f..866bc8d 100644 --- a/cmd/gitlab-sshd/main.go +++ b/cmd/gitlab-sshd/main.go @@ -6,6 +6,7 @@ import ( log "github.com/sirupsen/logrus" + "gitlab.com/gitlab-org/gitlab-shell/internal/command" "gitlab.com/gitlab-org/gitlab-shell/internal/config" "gitlab.com/gitlab-org/gitlab-shell/internal/logger" "gitlab.com/gitlab-org/gitlab-shell/internal/sshd" @@ -59,6 +60,9 @@ func main() { logger.ConfigureStandalone(cfg) + ctx, finished := command.Setup("gitlab-sshd", cfg) + defer finished() + // Startup monitoring endpoint. if cfg.Server.WebListen != "" { go func() { @@ -71,7 +75,7 @@ func main() { }() } - if err := sshd.Run(cfg); err != nil { + if err := sshd.Run(ctx, cfg); err != nil { log.Fatalf("Failed to start GitLab built-in sshd: %v", err) } } |