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:
authorJacob Vosmaer (GitLab) <jacob@gitlab.com>2018-04-06 11:24:05 +0300
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2018-04-06 11:24:05 +0300
commitadb34a203b860ca19980b9d521630f4a6da12150 (patch)
treedfac15449fedcce436c484952e3c12ced61057cd /internal/server
parentc0017a069b4e051430cd0cb4363a1ff0b7dc2f76 (diff)
Run Go test suite with '-race' in CI
Diffstat (limited to 'internal/server')
-rw-r--r--internal/server/server.go10
1 files changed, 7 insertions, 3 deletions
diff --git a/internal/server/server.go b/internal/server/server.go
index 4e9e55ca5..41eb602a7 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -40,8 +40,9 @@ func concurrencyKeyFn(ctx context.Context) string {
return ""
}
-// New returns a GRPC server with all Gitaly services and interceptors set up.
-func New(rubyServer *rubyserver.Server) *grpc.Server {
+var logrusEntry *log.Entry
+
+func init() {
logger := log.StandardLogger()
urlSanitizer := logsanitizer.NewURLSanitizerHook()
@@ -52,9 +53,12 @@ func New(rubyServer *rubyserver.Server) *grpc.Server {
)
logger.Hooks.Add(urlSanitizer)
- logrusEntry := log.NewEntry(logger)
+ logrusEntry = log.NewEntry(logger)
grpc_logrus.ReplaceGrpcLogger(logrusEntry)
+}
+// New returns a GRPC server with all Gitaly services and interceptors set up.
+func New(rubyServer *rubyserver.Server) *grpc.Server {
ctxTagOpts := []grpc_ctxtags.Option{
grpc_ctxtags.WithFieldExtractorForInitialReq(fieldextractors.FieldExtractor),
}