mirror of
https://github.com/daeuniverse/dae.git
synced 2025-07-12 16:59:38 +07:00
fix: log
This commit is contained in:
@ -84,13 +84,16 @@ func (a *AliveDialerSet) SetAlive(dialer *Dialer, alive bool) {
|
|||||||
var (
|
var (
|
||||||
latency time.Duration
|
latency time.Duration
|
||||||
hasLatency bool
|
hasLatency bool
|
||||||
|
minPolicy bool
|
||||||
)
|
)
|
||||||
|
|
||||||
switch a.selectionPolicy {
|
switch a.selectionPolicy {
|
||||||
case consts.DialerSelectionPolicy_MinLastLatency:
|
case consts.DialerSelectionPolicy_MinLastLatency:
|
||||||
latency, hasLatency = dialer.Latencies10.LastLatency()
|
latency, hasLatency = dialer.Latencies10.LastLatency()
|
||||||
|
minPolicy = true
|
||||||
case consts.DialerSelectionPolicy_MinAverage10Latencies:
|
case consts.DialerSelectionPolicy_MinAverage10Latencies:
|
||||||
latency, hasLatency = dialer.Latencies10.AvgLatency()
|
latency, hasLatency = dialer.Latencies10.AvgLatency()
|
||||||
|
minPolicy = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if alive {
|
if alive {
|
||||||
@ -128,8 +131,9 @@ func (a *AliveDialerSet) SetAlive(dialer *Dialer, alive bool) {
|
|||||||
// This dialer is already not alive.
|
// This dialer is already not alive.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
oldBestDialer := a.minLatency.dialer
|
|
||||||
if hasLatency {
|
if hasLatency {
|
||||||
|
oldBestDialer := a.minLatency.dialer
|
||||||
// Calc minLatency.
|
// Calc minLatency.
|
||||||
a.dialerToLatency[dialer] = latency
|
a.dialerToLatency[dialer] = latency
|
||||||
if latency < a.minLatency.latency {
|
if latency < a.minLatency.latency {
|
||||||
@ -144,7 +148,7 @@ func (a *AliveDialerSet) SetAlive(dialer *Dialer, alive bool) {
|
|||||||
a.log.Infof("Group [%v] switched dialer to <%v> (%v): %v", a.dialerGroupName, a.minLatency.dialer.Name(), a.selectionPolicy, a.minLatency.latency)
|
a.log.Infof("Group [%v] switched dialer to <%v> (%v): %v", a.dialerGroupName, a.minLatency.dialer.Name(), a.selectionPolicy, a.minLatency.latency)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if alive && a.minLatency.dialer == nil {
|
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.
|
||||||
a.minLatency.dialer = dialer
|
a.minLatency.dialer = dialer
|
||||||
a.log.Infof("Group [%v] switched dialer to <%v>", a.dialerGroupName, a.minLatency.dialer.Name())
|
a.log.Infof("Group [%v] switched dialer to <%v>", a.dialerGroupName, a.minLatency.dialer.Name())
|
||||||
|
@ -55,7 +55,7 @@ group {
|
|||||||
|
|
||||||
routing {
|
routing {
|
||||||
domain(geosite:category-ads) -> block
|
domain(geosite:category-ads) -> block
|
||||||
l4proto(udp) && mac('02:42:ac:11:00:03') -> BT
|
l4proto(udp) && mac('02:42:ac:11:00:03') -> my_group
|
||||||
domain(geosite:category-ads) -> block
|
domain(geosite:category-ads) -> block
|
||||||
domain(geosite:disney) -> disney
|
domain(geosite:disney) -> disney
|
||||||
domain(geosite:netflix) -> netflix
|
domain(geosite:netflix) -> netflix
|
||||||
|
@ -16,6 +16,8 @@ func NewLogger(verbose int) *logrus.Logger {
|
|||||||
level = logrus.WarnLevel
|
level = logrus.WarnLevel
|
||||||
case 1:
|
case 1:
|
||||||
level = logrus.InfoLevel
|
level = logrus.InfoLevel
|
||||||
|
case 2:
|
||||||
|
level = logrus.DebugLevel
|
||||||
default:
|
default:
|
||||||
level = logrus.TraceLevel
|
level = logrus.TraceLevel
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user