Writefreely
/
writefreely
mirror of https://github.com/writeas/writefreely
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge af11b39459 into 427f4980b9

This commit is contained in:
idk 2024-02-20 12:54:09 -07:00 committed by GitHub
parent 427f4980b9 af11b39459
commit 0e0cc6d5da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app.go
View File

@ -448,6 +448,8 @@ func Initialize(apper Apper, debug bool) (*App, error) {
return apper.App(), nil
}
var Listen = net.Listen
func Serve(app *App, r *mux.Router) {
log.Info("Going to serve...")
@ -505,17 +507,23 @@ requests. We recommend supplying a valid host name.`)
go func() {
log.Info("Serving redirects on http://%s:80", bindAddress)
err = http.ListenAndServe(":80", m.HTTPHandler(nil))
listener, err := Listen("tcp", fmt.Sprintf("%s:80", bindAddress))
log.Error("Unable to listen on %s: %v", bindAddress, err)
err = http.Serve(listener, m.HTTPHandler(nil))
log.Error("Unable to start redirect server: %v", err)
}()
log.Info("Serving on https://%s:443", bindAddress)
log.Info("---")
err = s.ListenAndServeTLS("", "")
listener, err := Listen("tcp", fmt.Sprintf("%s:443", bindAddress))
log.Error("Unable to listen on %s: %v", bindAddress, err)
err = s.ServeTLS(listener, "", "")
log.Error("Unable to start https server: %v", err)
} else {
go func() {
listener, err := Listen("tcp", fmt.Sprintf("%s:80", bindAddress))
log.Error("Unable to listen on %s: %v", bindAddress, err)
log.Info("Serving redirects on http://%s:80", bindAddress)
err = http.ListenAndServe(fmt.Sprintf("%s:80", bindAddress), http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
err = http.Serve(listener, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, app.cfg.App.Host, http.StatusMovedPermanently)
}))
log.Error("Unable to start redirect server: %v", err)
@ -524,7 +532,10 @@ requests. We recommend supplying a valid host name.`)
log.Info("Serving on https://%s:443", bindAddress)
log.Info("Using manual certificates")
log.Info("---")
err = http.ListenAndServeTLS(fmt.Sprintf("%s:443", bindAddress), app.cfg.Server.TLSCertPath, app.cfg.Server.TLSKeyPath, r)
listener, err := Listen("tcp", fmt.Sprintf("%s:443", bindAddress))
log.Error("Unable to listen on %s: %v", bindAddress, err)
err = http.ServeTLS(listener, r, app.cfg.Server.TLSCertPath, app.cfg.Server.TLSKeyPath)
log.Error("Unable to start https server: %v", err)
}
} else {
network := "tcp"
@ -546,7 +557,7 @@ requests. We recommend supplying a valid host name.`)
log.Info("Serving on %s://%s", protocol, bindAddress)
log.Info("---")
listener, err := net.Listen(network, bindAddress)
listener, err := Listen(network, bindAddress)
if err != nil {
log.Error("Could not bind to address: %v", err)
os.Exit(1)
@ -562,6 +573,7 @@ requests. We recommend supplying a valid host name.`)
defer listener.Close()
err = http.Serve(listener, r)
log.Error("Unable to start http server: %v", err)
}
if err != nil {
log.Error("Unable to start: %v", err)

7
gopher.go
View File

@ -24,10 +24,13 @@ import (
func initGopher(apper Apper) {
handler := NewWFHandler(apper)
gopher.HandleFunc("/", handler.Gopher(handleGopher))
log.Info("Serving on gopher://localhost:%d", apper.App().Config().Server.GopherPort)
gopher.ListenAndServe(fmt.Sprintf(":%d", apper.App().Config().Server.GopherPort), nil)
listener, err := Listen("tcp", fmt.Sprintf("%s:%d", apper.App().Config().Server.Bind, apper.App().Config().Server.GopherPort))
if err != nil {
panic(err)
}
gopher.Serve(listener, nil)
}
// Utility function to strip the URL from the hostname provided by app.cfg.App.Host