summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2021-09-16 02:14:48 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2021-09-16 02:14:48 +0000
commit37025e61e570e748613d9a5a57a7ae5de1b45af5 (patch)
tree159c78d0b98126365dd3f3f08502e4c4a5110033 /cmd
parent3f640bdafe429501897541cadf2c268b13c4cf9f (diff)
parentaf3aac6b459791fabd8ebc306cdff47c609fbf53 (diff)
downloadgitlab-shell-37025e61e570e748613d9a5a57a7ae5de1b45af5.tar.gz
Merge branch 'id-context-fields' into 'main'
Add context fields to logging See merge request gitlab-org/gitlab-shell!524
Diffstat (limited to 'cmd')
-rw-r--r--cmd/gitlab-sshd/main.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/gitlab-sshd/main.go b/cmd/gitlab-sshd/main.go
index 5bbf221..165c7a5 100644
--- a/cmd/gitlab-sshd/main.go
+++ b/cmd/gitlab-sshd/main.go
@@ -97,7 +97,7 @@ func main() {
sig := <-done
signal.Reset(syscall.SIGINT, syscall.SIGTERM)
- log.WithFields(log.Fields{"shutdown_timeout_s": cfg.Server.GracePeriodSeconds, "signal": sig.String()}).Info("Shutdown initiated")
+ log.WithContextFields(ctx, log.Fields{"shutdown_timeout_s": cfg.Server.GracePeriodSeconds, "signal": sig.String()}).Info("Shutdown initiated")
server.Shutdown()