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

feat/optimize: print SubscriptionTag in AliveDialerSet::printLatencies() (#319)

Browse Source
This commit is contained in:
Luo Chen
2023-09-03 21:17:58 +08:00
committed by GitHub
parent 371e0c19d1
commit bfd4d99744
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,7 @@ func (a *AliveDialerSet) printLatencies() {
return alive[i].l+alive[i].o < alive[j].l+alive[j].o return alive[i].l+alive[i].o < alive[j].l+alive[j].o
}) })
for i, dl := range alive { for i, dl := range alive {
builder.WriteString(fmt.Sprintf("%4d. %v: %v\n", i+1, dl.d.property.Name, latencyString(dl.l, dl.o))) builder.WriteString(fmt.Sprintf("%4d. [%v] %v: %v\n", i+1, dl.d.property.SubscriptionTag, dl.d.property.Name, latencyString(dl.l, dl.o)))
} }
a.log.Infoln(strings.TrimSuffix(builder.String(), "\n")) a.log.Infoln(strings.TrimSuffix(builder.String(), "\n"))
} }

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

@ -52,6 +52,7 @@ type Property struct {
Address string Address string
Protocol string Protocol string
Link string Link string
SubscriptionTag string
} }
type AliveDialerSetSet map[*AliveDialerSet]int type AliveDialerSetSet map[*AliveDialerSet]int

3
component/outbound/dialer/register.go
View File

@ -23,7 +23,7 @@ func FromLinkRegister(name string, creator FromLinkCreator) {
fromLinkCreators[name] = creator fromLinkCreators[name] = creator
} }
func NewFromLink(gOption *GlobalOption, iOption InstanceOption, link string) (*Dialer, error) { func NewFromLink(gOption *GlobalOption, iOption InstanceOption, link string, subscriptionTag string) (*Dialer, error) {
/// Get overwritten name. /// Get overwritten name.
overwrittenName, linklike := common.GetTagFromLinkLikePlaintext(link) overwrittenName, linklike := common.GetTagFromLinkLikePlaintext(link)
links := strings.Split(linklike, "->") links := strings.Split(linklike, "->")
@ -33,6 +33,7 @@ func NewFromLink(gOption *GlobalOption, iOption InstanceOption, link string) (*D
Address: "", Address: "",
Protocol: "", Protocol: "",
Link: link, Link: link,
SubscriptionTag: subscriptionTag,
} }
for i := len(links) - 1; i >= 0; i-- { for i := len(links) - 1; i >= 0; i-- {
link := strings.TrimSpace(links[i]) link := strings.TrimSpace(links[i])

2
component/outbound/filter.go
View File

@ -39,7 +39,7 @@ func NewDialerSetFromLinks(option *dialer.GlobalOption, tagToNodeList map[string
} }
for subscriptionTag, nodes := range tagToNodeList { for subscriptionTag, nodes := range tagToNodeList {
for _, node := range nodes { for _, node := range nodes {
d, err := dialer.NewFromLink(option, dialer.InstanceOption{CheckEnabled: false}, node) d, err := dialer.NewFromLink(option, dialer.InstanceOption{CheckEnabled: false}, node, subscriptionTag)
if err != nil { if err != nil {
option.Log.Infof("failed to parse node: %v", err) option.Log.Infof("failed to parse node: %v", err)
continue continue