mirror of
https://github.com/owncast/owncast.git
synced 2024-11-21 20:28:15 +03:00
Fix the http port used not in sync with what is logged (#766)
* 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:
parent
b61a952bd8
commit
cbcf8d4794
3 changed files with 8 additions and 9 deletions
|
@ -72,10 +72,8 @@ func Start() error {
|
|||
// start the rtmp server
|
||||
go rtmp.Start(setStreamAsConnected, setBroadcaster)
|
||||
|
||||
port := config.WebServerPort
|
||||
rtmpPort := data.GetRTMPPortNumber()
|
||||
log.Infof("Web server is listening on port %d, RTMP is accepting inbound streams on port %d.", port, rtmpPort)
|
||||
log.Infoln("The web admin interface is available at /admin.")
|
||||
log.Infof("RTMP is accepting inbound streams on port %d.", rtmpPort)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
10
main.go
10
main.go
|
@ -103,11 +103,6 @@ func main() {
|
|||
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
|
||||
if *webServerPortOverride != "" {
|
||||
portNumber, err := strconv.Atoi(*webServerPortOverride)
|
||||
|
@ -121,6 +116,11 @@ func main() {
|
|||
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 {
|
||||
log.Fatalln("failed to start/run the router", err)
|
||||
}
|
||||
|
|
|
@ -185,7 +185,8 @@ func Start() error {
|
|||
|
||||
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)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue