mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-06 16:29:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

feat: new log formatter

Browse Source
This commit is contained in:
mzz2017
2023-02-04 15:02:44 +08:00
parent 68c8ff7754
commit a70d09f59a
8 changed files with 113 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
component/outbound/dialer/alive_dialer_set.go
View File

@ -146,16 +146,25 @@ func (a *AliveDialerSet) SetAlive(dialer *Dialer, alive bool) {
}
if a.minLatency.dialer != oldBestDialer {
if a.minLatency.dialer != nil {
a.log.Infof("Group [%v] switched dialer to <%v> (%v): %v", a.dialerGroupName, a.minLatency.dialer.Name(), a.selectionPolicy, a.minLatency.latency)
a.log.WithFields(logrus.Fields{
string(a.selectionPolicy): a.minLatency.latency,
"group": a.dialerGroupName,
"dialer": a.minLatency.dialer.Name(),
}).Infof("Group re-selects dialer")
} else {
a.log.Infof("Group [%v] has no dialer alive", a.dialerGroupName)
a.log.WithFields(logrus.Fields{
"group": a.dialerGroupName,
}).Infof("Group has no dialer alive")
}
}
} else {
if alive && minPolicy && a.minLatency.dialer == nil {
// Use first dialer if no dialer has alive state.
// Use first dialer if no dialer has alive state (usually happen at the very beginning).
a.minLatency.dialer = dialer
a.log.Infof("Group [%v] switched dialer to <%v>", a.dialerGroupName, a.minLatency.dialer.Name())
a.log.WithFields(logrus.Fields{
"group": a.dialerGroupName,
"dialer": a.minLatency.dialer.Name(),
}).Infof("Group re-selects dialer")
}
}
}

2
component/outbound/dialer/dialer.go
View File

@ -151,7 +151,7 @@ func (d *Dialer) Check(timeout time.Duration, url string) (ok bool, err error) {
latency := time.Since(start)
d.Latencies10.AppendLatency(latency)
avg, _ := d.Latencies10.AvgLatency()
d.Log.Debugf("Connectivity Check <%v>: last: %v, avg_10: %v", d.name, latency, avg)
d.Log.WithField("node", d.name).WithField("last", latency.Truncate(time.Millisecond)).WithField("avg_10", avg.Truncate(time.Millisecond)).Debugf("Connectivity Check")
alive = true
} else {
// Append timeout if there is any error or unexpected status code.