Skip to content

Commit

Permalink
add healthz api (fatedier#2511)
Browse files Browse the repository at this point in the history
  • Loading branch information
fatedier committed Aug 4, 2021
1 parent f570dcb commit 82f80a2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
3 changes: 2 additions & 1 deletion client/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ func (svr *Service) RunAdminServer(address string) (err error) {
user, passwd := svr.cfg.AdminUser, svr.cfg.AdminPwd
router.Use(frpNet.NewHTTPAuthMiddleware(user, passwd).Middleware)

// api, see dashboard_api.go
// api, see admin_api.go
router.HandleFunc("/healthz", svr.healthz)
router.HandleFunc("/api/reload", svr.apiReload).Methods("GET")
router.HandleFunc("/api/status", svr.apiStatus).Methods("GET")
router.HandleFunc("/api/config", svr.apiGetConfig).Methods("GET")
Expand Down
5 changes: 5 additions & 0 deletions client/admin_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ type GeneralResponse struct {
Msg string
}

// /healthz
func (svr *Service) healthz(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(200)
}

// GET api/reload
func (svr *Service) apiReload(w http.ResponseWriter, r *http.Request) {
res := GeneralResponse{Code: 200}
Expand Down
1 change: 1 addition & 0 deletions server/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ func (svr *Service) RunDashboardServer(address string) (err error) {
router.HandleFunc("/api/proxy/{type}", svr.APIProxyByType).Methods("GET")
router.HandleFunc("/api/proxy/{type}/{name}", svr.APIProxyByTypeAndName).Methods("GET")
router.HandleFunc("/api/traffic/{name}", svr.APIProxyTraffic).Methods("GET")
router.HandleFunc("/healthz", svr.Healthz)

// view
router.Handle("/favicon.ico", http.FileServer(assets.FileSystem)).Methods("GET")
Expand Down
5 changes: 5 additions & 0 deletions server/dashboard_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ type serverInfoResp struct {
ProxyTypeCounts map[string]int64 `json:"proxy_type_count"`
}

// /healthz
func (svr *Service) Healthz(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(200)
}

// api/serverinfo
func (svr *Service) APIServerInfo(w http.ResponseWriter, r *http.Request) {
res := GeneralResponse{Code: 200}
Expand Down

0 comments on commit 82f80a2

Please sign in to comment.