marcel/zoraxy
1
0
Fork 0
mirror of https://github.com/tobychui/zoraxy.git synced 2025-06-03 06:07:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

⏪ keep compatible with go 1.20

Browse Source
This commit is contained in:
Kawin Viriyaprasopsook 2024-07-23 08:20:59 +07:00
parent bec363abab
commit d64b1174af
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/upstreams.go
View File

@ -1,10 +1,9 @@
package main
import (
"cmp"
"encoding/json"
"net/http"
"slices"
"sort"
"strings"
"imuslab.com/zoraxy/mod/dynamicproxy/loadbalance"
@ -34,22 +33,19 @@ func ReverseProxyUpstreamList(w http.ResponseWriter, r *http.Request) {
activeUpstreams := targetEndpoint.ActiveOrigins
inactiveUpstreams := targetEndpoint.InactiveOrigins
slices.SortStableFunc(activeUpstreams, func(i, j *loadbalance.Upstream) int {
if i.Weight != j.Weight {
// sort by weight DESC
return cmp.Compare(j.Weight, i.Weight)
// Sort the upstreams slice by weight, then by origin domain alphabetically
sort.Slice(activeUpstreams, func(i, j int) bool {
if activeUpstreams[i].Weight != activeUpstreams[j].Weight {
return activeUpstreams[i].Weight > activeUpstreams[j].Weight
}
// sort by origin ASC
return cmp.Compare(i.OriginIpOrDomain, j.OriginIpOrDomain)
return activeUpstreams[i].OriginIpOrDomain < activeUpstreams[j].OriginIpOrDomain
})
slices.SortStableFunc(inactiveUpstreams, func(i, j *loadbalance.Upstream) int {
if i.Weight != j.Weight {
// sort by weight DESC
return cmp.Compare(j.Weight, i.Weight)
sort.Slice(inactiveUpstreams, func(i, j int) bool {
if inactiveUpstreams[i].Weight != inactiveUpstreams[j].Weight {
return inactiveUpstreams[i].Weight > inactiveUpstreams[j].Weight
}
// sort by origin ASC
return cmp.Compare(i.OriginIpOrDomain, j.OriginIpOrDomain)
return inactiveUpstreams[i].OriginIpOrDomain < inactiveUpstreams[j].OriginIpOrDomain
})
type UpstreamCombinedList struct {