mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-11-22 12:49:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix the http port used not in sync with what is logged (#766)

Browse source 
* Fix the http port used not in sync with what is logged

* Actually fix the logging race condition

* Move the router logging to the router package
This commit is contained in:
Bradley Hilton 2021-02-26 13:23:15 -06:00 committed by GitHub
parent b61a952bd8
commit cbcf8d4794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/core.go
View file

@ -72,10 +72,8 @@ func Start() error {
// start the rtmp server // start the rtmp server
go rtmp.Start(setStreamAsConnected, setBroadcaster) go rtmp.Start(setStreamAsConnected, setBroadcaster)
port := config.WebServerPort
rtmpPort := data.GetRTMPPortNumber() rtmpPort := data.GetRTMPPortNumber()
log.Infof("Web server is listening on port %d, RTMP is accepting inbound streams on port %d.", port, rtmpPort) log.Infof("RTMP is accepting inbound streams on port %d.", rtmpPort)
log.Infoln("The web admin interface is available at /admin.")
return nil return nil
} }

10
main.go
View file

@ -103,11 +103,6 @@ func main() {
log.Exit(0) log.Exit(0)
} }
// starts the core
if err := core.Start(); err != nil {
log.Fatalln("failed to start the core package", err)
}
// Set the web server port // Set the web server port
if *webServerPortOverride != "" { if *webServerPortOverride != "" {
portNumber, err := strconv.Atoi(*webServerPortOverride) portNumber, err := strconv.Atoi(*webServerPortOverride)
@ -121,6 +116,11 @@ func main() {
config.WebServerPort = data.GetHTTPPortNumber() config.WebServerPort = data.GetHTTPPortNumber()
} }
// starts the core
if err := core.Start(); err != nil {
log.Fatalln("failed to start the core package", err)
}
if err := router.Start(); err != nil { if err := router.Start(); err != nil {
log.Fatalln("failed to start/run the router", err) log.Fatalln("failed to start/run the router", err)
} }

3
router/router.go
View file

@ -185,7 +185,8 @@ func Start() error {
port := config.WebServerPort port := config.WebServerPort
log.Tracef("Web server running on port: %d", port) log.Infof("Web server is listening on port %d.", port)
log.Infoln("The web admin interface is available at /admin.")
return http.ListenAndServe(fmt.Sprintf(":%d", port), nil) return http.ListenAndServe(fmt.Sprintf(":%d", port), nil)
} }