refactored deprecated code
This commit is contained in:
@@ -10,6 +10,7 @@ import (
|
||||
msg "github.com/tech/sendico/pkg/messaging"
|
||||
"github.com/tech/sendico/pkg/mlogger"
|
||||
"go.uber.org/zap"
|
||||
"go.uber.org/zap/zapcore"
|
||||
)
|
||||
|
||||
const defaultReannounceHeartbeatFactor = 6
|
||||
@@ -20,10 +21,11 @@ type Announcer struct {
|
||||
sender string
|
||||
announce Announcement
|
||||
|
||||
startOnce sync.Once
|
||||
stopOnce sync.Once
|
||||
stopCh chan struct{}
|
||||
doneCh chan struct{}
|
||||
startOnce sync.Once
|
||||
stopOnce sync.Once
|
||||
stopCh chan struct{}
|
||||
doneCh chan struct{}
|
||||
announceLevel zapcore.Level
|
||||
}
|
||||
|
||||
func NewAnnouncer(logger mlogger.Logger, producer msg.Producer, sender string, announce Announcement) *Announcer {
|
||||
@@ -42,12 +44,13 @@ func NewAnnouncer(logger mlogger.Logger, producer msg.Producer, sender string, a
|
||||
announce.ID = DefaultEntryID(announce.Service)
|
||||
}
|
||||
return &Announcer{
|
||||
logger: logger,
|
||||
producer: producer,
|
||||
sender: strings.TrimSpace(sender),
|
||||
announce: announce,
|
||||
stopCh: make(chan struct{}),
|
||||
doneCh: make(chan struct{}),
|
||||
logger: logger,
|
||||
producer: producer,
|
||||
sender: strings.TrimSpace(sender),
|
||||
announce: announce,
|
||||
stopCh: make(chan struct{}),
|
||||
doneCh: make(chan struct{}),
|
||||
announceLevel: zapcore.InfoLevel,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,7 +129,8 @@ func (a *Announcer) sendAnnouncement() {
|
||||
a.logWarn("Failed to publish discovery announce", fields...)
|
||||
return
|
||||
}
|
||||
a.logInfo("Discovery announce published", append(announcementFields(a.announce), zap.String("event", event.ToString()))...)
|
||||
a.logger.Log(a.announceLevel, "Discovery announce published", append(announcementFields(a.announce), zap.String("event", event.ToString()))...)
|
||||
a.announceLevel = zapcore.DebugLevel
|
||||
}
|
||||
|
||||
func (a *Announcer) sendHeartbeat() {
|
||||
|
||||
Reference in New Issue
Block a user