Browse Source

Revert "Consolidate the ping and status request APIs"

This reverts commit b96cd2e93e.
pull/1130/head
Gabe Kangas 4 years ago
parent
commit
bb8aea6446
  1. 13
      controllers/ping.go
  2. 4
      controllers/status.go
  3. 3
      router/router.go

13
controllers/ping.go

@ -0,0 +1,13 @@
package controllers
import (
"net/http"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/utils"
)
func Ping(w http.ResponseWriter, r *http.Request) {
id := utils.GenerateClientIDFromRequest(r)
core.SetViewerIdActive(id)
}

4
controllers/status.go

@ -27,10 +27,6 @@ func GetStatus(w http.ResponseWriter, r *http.Request) {
if err := json.NewEncoder(w).Encode(response); err != nil { if err := json.NewEncoder(w).Encode(response); err != nil {
InternalErrorHandler(w, err) InternalErrorHandler(w, err)
} }
// Mark the user who requested this status as an active viewer
id := utils.GenerateClientIDFromRequest(r)
core.SetViewerIdActive(id)
} }
type webStatusResponse struct { type webStatusResponse struct {

3
router/router.go

@ -62,6 +62,9 @@ func Start() error {
// return the list of video variants available // return the list of video variants available
http.HandleFunc("/api/video/variants", controllers.GetVideoStreamOutputVariants) http.HandleFunc("/api/video/variants", controllers.GetVideoStreamOutputVariants)
// tell the backend you're an active viewer
http.HandleFunc("/api/ping", controllers.Ping)
// Authenticated admin requests // Authenticated admin requests
// Current inbound broadcaster // Current inbound broadcaster

Loading…
Cancel
Save