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:
authorjramsay <jcai@gitlab.com>2019-10-19 17:45:27 +0300
committerjramsay <jcai@gitlab.com>2019-10-19 17:45:27 +0300
commitd2504f0229c064489b7ca2b321796c8873295ef5 (patch)
tree8cc72db965eec6976d90c797c60bdcc9410f69b5
parent772ef62b65125bf87441c064fa021f3a16e82cf9 (diff)
Removing test logging hook since they are not thread safe
-rw-r--r--internal/testhelper/test_hook.go40
1 files changed, 1 insertions, 39 deletions
diff --git a/internal/testhelper/test_hook.go b/internal/testhelper/test_hook.go
index 93d229a2a..448dd2c5b 100644
--- a/internal/testhelper/test_hook.go
+++ b/internal/testhelper/test_hook.go
@@ -7,48 +7,10 @@ import (
log "github.com/sirupsen/logrus"
)
-type testHook struct {
- t testing.TB
- formatter log.Formatter
-}
-
-func (s testHook) Levels() []log.Level {
- return []log.Level{
- log.DebugLevel,
- log.InfoLevel,
- log.WarnLevel,
- log.ErrorLevel,
- log.FatalLevel,
- log.PanicLevel,
- }
-}
-
-func (s testHook) Fire(entry *log.Entry) error {
- formatted, err := s.formatter.Format(entry)
- if err != nil {
- return err
- }
-
- formattedString := string(formatted)
-
- switch entry.Level {
- case log.FatalLevel, log.PanicLevel:
- s.t.Fatal(formattedString)
-
- default:
- s.t.Log(formattedString)
- }
-
- return nil
-}
-
-// NewTestLogger created a logrus hook which can be used with testing logs
+// NewTestLogger created a logrus hook
func NewTestLogger(tb testing.TB) *log.Logger {
logger := log.New()
logger.Out = ioutil.Discard
- formatter := &log.TextFormatter{}
-
- logger.Hooks.Add(testHook{tb, formatter})
return logger
}