Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Mazurskiy <mmazurskiy@gitlab.com>2022-08-26 15:56:48 +0300
committerMikhail Mazurskiy <mmazurskiy@gitlab.com>2022-08-26 15:56:48 +0300
commitdcf3a69a730c676ff486f81c535dba2e4e40d602 (patch)
tree67298ee28af07f52959982560827869aacc4784f /cmd/gitaly-ssh
parentb7b64d3ec5ff19f50d432a07cd6ac6c05ab141f5 (diff)
Let client users specify interceptorsash2k/client-fixes
Do not assume client users want the same tracing interceptors with the same configuration.
Diffstat (limited to 'cmd/gitaly-ssh')
-rw-r--r--cmd/gitaly-ssh/main.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/gitaly-ssh/main.go b/cmd/gitaly-ssh/main.go
index dc7989b50..7284ca6c0 100644
--- a/cmd/gitaly-ssh/main.go
+++ b/cmd/gitaly-ssh/main.go
@@ -11,6 +11,7 @@ import (
"github.com/sirupsen/logrus"
gitalyauth "gitlab.com/gitlab-org/gitaly/v15/auth"
"gitlab.com/gitlab-org/gitaly/v15/client"
+ internalclient "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/client"
"gitlab.com/gitlab-org/gitaly/v15/internal/metadata/featureflag"
"gitlab.com/gitlab-org/labkit/tracing"
"google.golang.org/grpc"
@@ -143,7 +144,7 @@ func dialOpts() []grpc.DialOption {
connOpts = append(connOpts, grpc.WithPerRPCCredentials(gitalyauth.RPCCredentialsV2(token)))
}
- return connOpts
+ return append(connOpts, internalclient.UnaryInterceptor(), internalclient.StreamInterceptor())
}
func useSidechannel() bool { return os.Getenv("GITALY_USE_SIDECHANNEL") == "1" }