diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-01-27 18:49:52 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-01-27 18:49:52 +0300 |
| commit | 86d933c0a993eabbff4c725da3cff067f371e641 (patch) | |
| tree | b97cbb792a999fa44e7cc09a5edefc7eb5ce9fb4 | |
| parent | 162a4cf52c7df145390b3ed183c45687d4e123f0 (diff) | |
| parent | 1a9e1112f894f3dd0467fcaaeebe5c3ba01cbde5 (diff) | |
Merge branch 'smh-remove-duplicate-logging' into 'master'
Remove duplicated logging interceptor
See merge request gitlab-org/gitaly!3063
| -rw-r--r-- | internal/gitaly/server/server.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/internal/gitaly/server/server.go b/internal/gitaly/server/server.go index 9c0ad9d6c..532d14d47 100644 --- a/internal/gitaly/server/server.go +++ b/internal/gitaly/server/server.go @@ -90,10 +90,9 @@ func createNewServer(rubyServer *rubyserver.Server, hookManager hook.Manager, cf grpccorrelation.StreamServerCorrelationInterceptor(), // Must be above the metadata handler metadatahandler.StreamInterceptor, grpc_prometheus.StreamServerInterceptor, - grpc_logrus.StreamServerInterceptor(logrusEntry), - featureflag.StreamInterceptor, commandstatshandler.StreamInterceptor, grpc_logrus.StreamServerInterceptor(logrusEntry, grpc_logrus.WithMessageProducer(commandstatshandler.CommandStatsMessageProducer)), + featureflag.StreamInterceptor, sentryhandler.StreamLogHandler, cancelhandler.Stream, // Should be below LogHandler auth.StreamServerInterceptor(cfg.Auth), @@ -109,10 +108,9 @@ func createNewServer(rubyServer *rubyserver.Server, hookManager hook.Manager, cf grpccorrelation.UnaryServerCorrelationInterceptor(), // Must be above the metadata handler metadatahandler.UnaryInterceptor, grpc_prometheus.UnaryServerInterceptor, - grpc_logrus.UnaryServerInterceptor(logrusEntry), - featureflag.UnaryInterceptor, commandstatshandler.UnaryInterceptor, grpc_logrus.UnaryServerInterceptor(logrusEntry, grpc_logrus.WithMessageProducer(commandstatshandler.CommandStatsMessageProducer)), + featureflag.UnaryInterceptor, sentryhandler.UnaryLogHandler, cancelhandler.Unary, // Should be below LogHandler auth.UnaryServerInterceptor(cfg.Auth), |