sjw/MovieNight
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Separate /live and / http handlers

Browse Source 
Separate the /live and / (main) http handlers.  This cleans up the
related code a little bit and makes it a lot easier to follow.
This commit is contained in:
Zorchenhimer 2021-01-16 15:29:23 -05:00
parent e051cade78
commit d06e2251a4
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handlers.go
View File

@ -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() l.RLock()
ch := channels[strings.Trim(r.URL.Path, "/")] ch := channels[strings.Trim(r.URL.Path, "/")]
l.RUnlock() l.RUnlock()
@ -426,6 +426,11 @@ func handleDefault(w http.ResponseWriter, r *http.Request) {
avutil.CopyFile(muxer, cursor) avutil.CopyFile(muxer, cursor)
} else { } else {
}
}
func handleDefault(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/" { if r.URL.Path != "/" {
// not really an error for the server, but for the client. // not really an error for the server, but for the client.
common.LogInfoln("[http 404] ", r.URL.Path) common.LogInfoln("[http 404] ", r.URL.Path)
@ -433,5 +438,4 @@ func handleDefault(w http.ResponseWriter, r *http.Request) {
} else { } else {
handleIndexTemplate(w, r) handleIndexTemplate(w, r)
} }
}
} }

1
main.go
View File

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