Browse Source

Separate /live and / http handlers

Separate the /live and / (main) http handlers.  This cleans up the
related code a little bit and makes it a lot easier to follow.
pull/1/head
Zorchenhimer 2 years ago
parent
commit
d06e2251a4
  1. 20
      handlers.go
  2. 1
      main.go

20
handlers.go

@ -408,7 +408,7 @@ func handlePlay(conn *rtmp.Conn) {
}
}
func handleDefault(w http.ResponseWriter, r *http.Request) {
func handleLive(w http.ResponseWriter, r *http.Request) {
l.RLock()
ch := channels[strings.Trim(r.URL.Path, "/")]
l.RUnlock()
@ -426,12 +426,16 @@ func handleDefault(w http.ResponseWriter, r *http.Request) {
avutil.CopyFile(muxer, cursor)
} else {
if r.URL.Path != "/" {
// not really an error for the server, but for the client.
common.LogInfoln("[http 404] ", r.URL.Path)
http.NotFound(w, r)
} else {
handleIndexTemplate(w, r)
}
}
}
func handleDefault(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/" {
// not really an error for the server, but for the client.
common.LogInfoln("[http 404] ", r.URL.Path)
http.NotFound(w, r)
} else {
handleIndexTemplate(w, r)
}
}

1
main.go

@ -145,6 +145,7 @@ func startServer() {
http.HandleFunc("/help", handleHelpTemplate)
http.HandleFunc("/emotes", handleEmoteTemplate)
http.HandleFunc("/live", handleLive)
http.HandleFunc("/", handleDefault)
err := http.ListenAndServe(addr, nil)

Loading…
Cancel
Save