Skip to content

Commit

Permalink
Code refactoring related to message handling and retry logic. (#3745)
Browse files Browse the repository at this point in the history
  • Loading branch information
fatedier committed Nov 6, 2023
1 parent 5760c1c commit 184223c
Show file tree
Hide file tree
Showing 11 changed files with 690 additions and 529 deletions.
1 change: 1 addition & 0 deletions Release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
### Fixes

* frpc: Return code 1 when the first login attempt fails and exits.
* When auth.method is `oidc` and auth.additionalScopes contains `HeartBeats`, if obtaining AccessToken fails, the application will be unresponsive.
9 changes: 8 additions & 1 deletion client/admin_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,14 @@ func (svr *Service) apiStatus(w http.ResponseWriter, _ *http.Request) {
_, _ = w.Write(buf)
}()

ps := svr.ctl.pm.GetAllProxyStatus()
svr.ctlMu.RLock()
ctl := svr.ctl
svr.ctlMu.RUnlock()
if ctl == nil {
return
}

ps := ctl.pm.GetAllProxyStatus()
for _, status := range ps {
res[status.Type] = append(res[status.Type], NewProxyStatusResp(status, svr.cfg.ServerAddr))
}
Expand Down
Loading

0 comments on commit 184223c

Please sign in to comment.