Hypernet/Passport
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚑 Fix query services too much 429

Browse Source
This commit is contained in:
LittleSheep 2024-06-23 16:11:49 +08:00
parent b919e100e0
commit 7ddbea8bcb
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/workspace.xml
View File

@ -4,10 +4,9 @@
<option name="autoReloadType" value="ALL" /> <option name="autoReloadType" value="ALL" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix registration service issue"> <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix avatar url missing endpoint prefix">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/models/accounts.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/accounts.go" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pkg/hyper/conn.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/hyper/conn.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/settings.toml" beforeDir="false" afterPath="$PROJECT_DIR$/settings.toml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -144,7 +143,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value=":sparkles: Basis perm nodes feature" />
<MESSAGE value=":sparkles: Permission check" /> <MESSAGE value=":sparkles: Permission check" />
<MESSAGE value=":zap: In memory auth context cache" /> <MESSAGE value=":zap: In memory auth context cache" />
<MESSAGE value=":sparkles: Bug fixes of permission check" /> <MESSAGE value=":sparkles: Bug fixes of permission check" />
@ -169,7 +167,8 @@
<MESSAGE value=":bug: FIx cannot resolve service" /> <MESSAGE value=":bug: FIx cannot resolve service" />
<MESSAGE value=":sparkles: Accepts token in querystring" /> <MESSAGE value=":sparkles: Accepts token in querystring" />
<MESSAGE value=":bug: Fix registration service issue" /> <MESSAGE value=":bug: Fix registration service issue" />
<option name="LAST_COMMIT_MESSAGE" value=":bug: Fix registration service issue" /> <MESSAGE value=":bug: Fix avatar url missing endpoint prefix" />
<option name="LAST_COMMIT_MESSAGE" value=":bug: Fix avatar url missing endpoint prefix" />
</component> </component>
<component name="VgoProject"> <component name="VgoProject">
<settings-migrated>true</settings-migrated> <settings-migrated>true</settings-migrated>

23
pkg/hyper/conn.go
View File

@ -1,15 +1,20 @@
package hyper package hyper
import ( import (
"context"
"fmt" "fmt"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
health "google.golang.org/grpc/health/grpc_health_v1"
"time"
_ "github.com/mbobakov/grpc-consul-resolver" _ "github.com/mbobakov/grpc-consul-resolver"
) )
type HyperConn struct { type HyperConn struct {
Addr string Addr string
cacheGrpcConn map[string]*grpc.ClientConn
} }
func NewHyperConn(addr string) *HyperConn { func NewHyperConn(addr string) *HyperConn {
@ -17,10 +22,26 @@ func NewHyperConn(addr string) *HyperConn {
} }
func (v *HyperConn) DiscoverServiceGRPC(name string) (*grpc.ClientConn, error) { func (v *HyperConn) DiscoverServiceGRPC(name string) (*grpc.ClientConn, error) {
if val, ok := v.cacheGrpcConn[name]; ok {
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()
if _, err := health.NewHealthClient(val).Check(ctx, &health.HealthCheckRequest{
Service: name,
}); err == nil {
return val, nil
} else {
delete(v.cacheGrpcConn, name)
}
}
target := fmt.Sprintf("consul://%s/%s", v.Addr, name) target := fmt.Sprintf("consul://%s/%s", v.Addr, name)
return grpc.NewClient( conn, err := grpc.NewClient(
target, target,
grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy": "round_robin"}`), grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy": "round_robin"}`),
) )
if err == nil {
v.cacheGrpcConn[name] = conn
}
return conn, err
} }