summaryrefslogtreecommitdiff
path: root/cmd/gitlab-sshd
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2021-05-24 09:35:16 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2021-05-24 09:35:16 +0000
commit8116ccb9cbc0a60803b3a9896057c79c70016eb3 (patch)
tree85e5feca1050427113d9fe6e5051c52331b3a7ab /cmd/gitlab-sshd
parent90b606cde3d71d8a4450a5b5da9be4454c7b379f (diff)
parentde13980f3795679958a65881a813723da37894f5 (diff)
downloadgitlab-shell-8116ccb9cbc0a60803b3a9896057c79c70016eb3.tar.gz
Merge branch '501-fix-opentracing-init' into 'main'
Fix opentracing setup for gitlab-sshd Closes #501 See merge request gitlab-org/gitlab-shell!473
Diffstat (limited to 'cmd/gitlab-sshd')
-rw-r--r--cmd/gitlab-sshd/main.go6
1 files changed, 5 insertions, 1 deletions
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)
}
}