summaryrefslogtreecommitdiff
path: root/internal/handler
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 /internal/handler
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 'internal/handler')
-rw-r--r--internal/handler/exec.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/handler/exec.go b/internal/handler/exec.go
index 27031b1..eb5211e 100644
--- a/internal/handler/exec.go
+++ b/internal/handler/exec.go
@@ -110,7 +110,7 @@ func getConn(ctx context.Context, gc *GitalyCommand) (*grpc.ClientConn, error) {
if serviceName == "" {
serviceName = "gitlab-shell-unknown"
- log.WithFields(log.Fields{"service_name": serviceName}).Warn("No gRPC service name specified, defaulting to gitlab-shell-unknown")
+ log.WithContextFields(ctx, log.Fields{"service_name": serviceName}).Warn("No gRPC service name specified, defaulting to gitlab-shell-unknown")
}
serviceName = fmt.Sprintf("%s-%s", serviceName, gc.ServiceName)