Kaynağa Gözat

Intergrate custom logger where applicable

tags/v2.0.0-rc1
9seconds 5 yıl önce
ebeveyn
işleme
172b596cf1
4 değiştirilmiş dosya ile 13 ekleme ve 12 silme
  1. 5
    0
      logger/init.go
  2. 1
    5
      mtglib/proxy.go
  3. 4
    6
      stats/statsd.go
  4. 3
    1
      stats/statsd_test.go

+ 5
- 0
logger/init.go Dosyayı Görüntüle

1
+package logger
2
+
3
+type StdLikeLogger interface {
4
+	Printf(format string, args ...interface{})
5
+}

+ 1
- 5
mtglib/proxy.go Dosyayı Görüntüle

87
 	p.workerPool.Release()
87
 	p.workerPool.Release()
88
 }
88
 }
89
 
89
 
90
-type antsLogger struct{}
91
-
92
-func (a antsLogger) Printf(msg string, args ...interface{}) {}
93
-
94
 func NewProxy(opts ProxyOpts) (*Proxy, error) {
90
 func NewProxy(opts ProxyOpts) (*Proxy, error) {
95
 	switch {
91
 	switch {
96
 	case opts.Network == nil:
92
 	case opts.Network == nil:
126
 
122
 
127
 	pool, err := ants.NewPoolWithFunc(int(concurrency), func(arg interface{}) {
123
 	pool, err := ants.NewPoolWithFunc(int(concurrency), func(arg interface{}) {
128
 		proxy.ServeConn(arg.(net.Conn))
124
 		proxy.ServeConn(arg.(net.Conn))
129
-	}, ants.WithLogger(antsLogger{}))
125
+	}, ants.WithLogger(opts.Logger.Named("ants")))
130
 	if err != nil {
126
 	if err != nil {
131
 		return nil, fmt.Errorf("cannot initialize a pool: %w", err)
127
 		return nil, fmt.Errorf("cannot initialize a pool: %w", err)
132
 	}
128
 	}

+ 4
- 6
stats/statsd.go Dosyayı Görüntüle

6
 	"time"
6
 	"time"
7
 
7
 
8
 	"github.com/9seconds/mtg/v2/events"
8
 	"github.com/9seconds/mtg/v2/events"
9
+	"github.com/9seconds/mtg/v2/logger"
9
 	"github.com/9seconds/mtg/v2/mtglib"
10
 	"github.com/9seconds/mtg/v2/mtglib"
10
 	statsd "github.com/smira/go-statsd"
11
 	statsd "github.com/smira/go-statsd"
11
 )
12
 )
12
 
13
 
13
-type statsdFakeLogger struct{}
14
-
15
-func (s statsdFakeLogger) Printf(msg string, args ...interface{}) {}
16
-
17
 type statsdProcessor struct {
14
 type statsdProcessor struct {
18
 	streams map[string]*streamInfo
15
 	streams map[string]*streamInfo
19
 	client  *statsd.Client
16
 	client  *statsd.Client
92
 	}
89
 	}
93
 }
90
 }
94
 
91
 
95
-func NewStatsd(address, metricPrefix, tagFormat string) (StatsdFactory, error) {
92
+func NewStatsd(address string, log logger.StdLikeLogger,
93
+	metricPrefix, tagFormat string) (StatsdFactory, error) {
96
 	options := []statsd.Option{
94
 	options := []statsd.Option{
97
 		statsd.MetricPrefix(metricPrefix),
95
 		statsd.MetricPrefix(metricPrefix),
98
-		statsd.Logger(statsdFakeLogger{}),
96
+		statsd.Logger(log),
99
 	}
97
 	}
100
 
98
 
101
 	switch strings.ToLower(tagFormat) {
99
 	switch strings.ToLower(tagFormat) {

+ 3
- 1
stats/statsd_test.go Dosyayı Görüntüle

8
 	"time"
8
 	"time"
9
 
9
 
10
 	"github.com/9seconds/mtg/v2/events"
10
 	"github.com/9seconds/mtg/v2/events"
11
+	"github.com/9seconds/mtg/v2/logger"
11
 	"github.com/9seconds/mtg/v2/mtglib"
12
 	"github.com/9seconds/mtg/v2/mtglib"
12
 	"github.com/9seconds/mtg/v2/stats"
13
 	"github.com/9seconds/mtg/v2/stats"
13
 	statsd "github.com/smira/go-statsd"
14
 	statsd "github.com/smira/go-statsd"
80
 func (suite *StatsdTestSuite) SetupTest() {
81
 func (suite *StatsdTestSuite) SetupTest() {
81
 	suite.statsdServer = statsdNewFakeServer()
82
 	suite.statsdServer = statsdNewFakeServer()
82
 
83
 
83
-	factory, err := stats.NewStatsd(suite.statsdServer.Addr(), "mtg.", "datadog")
84
+	factory, err := stats.NewStatsd(suite.statsdServer.Addr(),
85
+		logger.NewNoopLogger(), "mtg.", "datadog")
84
 	if err != nil {
86
 	if err != nil {
85
 		panic(err)
87
 		panic(err)
86
 	}
88
 	}

Loading…
İptal
Kaydet