From b6f70909a26265fc1b5a11a04bc6722a74b99d49 Mon Sep 17 00:00:00 2001 From: Rafael da Fonseca Date: Thu, 13 Jul 2023 20:15:04 +0100 Subject: [PATCH] fixup --- app.go | 1 + logger/logrus/logrus.go | 56 ++++++++++++++++++++--------------------- mocks/app.go | 14 +++++++++++ static.go | 3 ++- 4 files changed, 45 insertions(+), 29 deletions(-) diff --git a/app.go b/app.go index 368e5138..f9f57127 100644 --- a/app.go +++ b/app.go @@ -70,6 +70,7 @@ const ( // Pitaya App interface type Pitaya interface { + AddAcceptor(acceptor.Acceptor) GetDieChan() chan bool SetDebug(debug bool) SetHeartbeatTime(interval time.Duration) diff --git a/logger/logrus/logrus.go b/logger/logrus/logrus.go index 01b2babc..b36c8ffd 100644 --- a/logger/logrus/logrus.go +++ b/logger/logrus/logrus.go @@ -9,109 +9,109 @@ type logrusImpl struct { Impl logrus.FieldLogger } -// New returns a new interfaces.Logger implementation based on logrus +// New returns a new interfaces.Logger Implementation based on logrus func New() interfaces.Logger { log := logrus.New() return NewWithLogger(log) } -// NewWithEntry returns a new interfaces.Logger implementation based on a provided logrus entry instance +// NewWithEntry returns a new interfaces.Logger Implementation based on a provided logrus entry instance // Deprecated: NewWithEntry is deprecated. func NewWithEntry(logger *logrus.Entry) interfaces.Logger { - return &logrusImpl{impl: logger} + return &logrusImpl{Impl: logger} } -// NewWithLogger returns a new interfaces.Logger implementation based on a provided logrus instance +// NewWithLogger returns a new interfaces.Logger Implementation based on a provided logrus instance // Deprecated: NewWithLogger is deprecated. func NewWithLogger(logger *logrus.Logger) interfaces.Logger { - return &logrusImpl{impl: logrus.NewEntry(logger)} + return &logrusImpl{Impl: logrus.NewEntry(logger)} } -// NewWithFieldLogger returns a new interfaces.Logger implementation based on a provided logrus instance +// NewWithFieldLogger returns a new interfaces.Logger Implementation based on a provided logrus instance func NewWithFieldLogger(logger logrus.FieldLogger) interfaces.Logger { - return &logrusImpl{impl: logger} + return &logrusImpl{Impl: logger} } func (l *logrusImpl) Fatal(format ...interface{}) { - l.impl.Fatal(format...) + l.Impl.Fatal(format...) } func (l *logrusImpl) Fatalf(format string, args ...interface{}) { - l.impl.Fatalf(format, args...) + l.Impl.Fatalf(format, args...) } func (l *logrusImpl) Fatalln(args ...interface{}) { - l.impl.Fatalln(args...) + l.Impl.Fatalln(args...) } func (l *logrusImpl) Debug(args ...interface{}) { - l.impl.Debug(args...) + l.Impl.Debug(args...) } func (l *logrusImpl) Debugf(format string, args ...interface{}) { - l.impl.Debugf(format, args...) + l.Impl.Debugf(format, args...) } func (l *logrusImpl) Debugln(args ...interface{}) { - l.impl.Debugln(args...) + l.Impl.Debugln(args...) } func (l *logrusImpl) Error(args ...interface{}) { - l.impl.Error(args...) + l.Impl.Error(args...) } func (l *logrusImpl) Errorf(format string, args ...interface{}) { - l.impl.Errorf(format, args...) + l.Impl.Errorf(format, args...) } func (l *logrusImpl) Errorln(args ...interface{}) { - l.impl.Errorln(args...) + l.Impl.Errorln(args...) } func (l *logrusImpl) Info(args ...interface{}) { - l.impl.Info(args...) + l.Impl.Info(args...) } func (l *logrusImpl) Infof(format string, args ...interface{}) { - l.impl.Infof(format, args...) + l.Impl.Infof(format, args...) } func (l *logrusImpl) Infoln(args ...interface{}) { - l.impl.Infoln(args...) + l.Impl.Infoln(args...) } func (l *logrusImpl) Warn(args ...interface{}) { - l.impl.Warn(args...) + l.Impl.Warn(args...) } func (l *logrusImpl) Warnf(format string, args ...interface{}) { - l.impl.Warnf(format, args...) + l.Impl.Warnf(format, args...) } func (l *logrusImpl) Warnln(args ...interface{}) { - l.impl.Warnln(args...) + l.Impl.Warnln(args...) } func (l *logrusImpl) Panic(args ...interface{}) { - l.impl.Panic(args...) + l.Impl.Panic(args...) } func (l *logrusImpl) Panicf(format string, args ...interface{}) { - l.impl.Panicf(format, args...) + l.Impl.Panicf(format, args...) } func (l *logrusImpl) Panicln(args ...interface{}) { - l.impl.Panicln(args...) + l.Impl.Panicln(args...) } func (l *logrusImpl) WithFields(fields map[string]interface{}) interfaces.Logger { - return &logrusImpl{impl: l.impl.WithFields(fields)} + return &logrusImpl{Impl: l.Impl.WithFields(fields)} } func (l *logrusImpl) WithField(key string, value interface{}) interfaces.Logger { - return &logrusImpl{impl: l.impl.WithField(key, value)} + return &logrusImpl{Impl: l.Impl.WithField(key, value)} } func (l *logrusImpl) WithError(err error) interfaces.Logger { - return &logrusImpl{impl: l.impl.WithError(err)} + return &logrusImpl{Impl: l.Impl.WithError(err)} } diff --git a/mocks/app.go b/mocks/app.go index ed98eafc..88fcf1af 100644 --- a/mocks/app.go +++ b/mocks/app.go @@ -10,6 +10,7 @@ import ( time "time" gomock "github.com/golang/mock/gomock" + acceptor "github.com/topfreegames/pitaya/v2/acceptor" cluster "github.com/topfreegames/pitaya/v2/cluster" component "github.com/topfreegames/pitaya/v2/component" config "github.com/topfreegames/pitaya/v2/config" @@ -624,3 +625,16 @@ func (mr *MockPitayaMockRecorder) StartWorker() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartWorker", reflect.TypeOf((*MockPitaya)(nil).StartWorker)) } + +// AddAcceptor mocks base method. +func (m *MockPitaya) AddAcceptor(arg0 acceptor.Acceptor) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "AddAcceptor", arg0) +} + +// AddAcceptor indicates an expected call of AddAcceptor. +func (mr *MockPitayaMockRecorder) AddAcceptor(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddAcceptor", reflect.TypeOf((*MockPitaya)(nil).AddAcceptor), arg0) +} + diff --git a/static.go b/static.go index 3a99138a..f32b7c69 100644 --- a/static.go +++ b/static.go @@ -26,6 +26,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/spf13/viper" + "github.com/topfreegames/pitaya/v2/acceptor" "github.com/topfreegames/pitaya/v2/cluster" "github.com/topfreegames/pitaya/v2/component" "github.com/topfreegames/pitaya/v2/config" @@ -222,5 +223,5 @@ func GetModule(name string) (interfaces.Module, error) { } func AddAcceptor(ac acceptor.Acceptor) { - return DefaultApp.AddAcceptor(ac) + DefaultApp.AddAcceptor(ac) }