all repos — homestead @ 6aa2452a44f15e72b72ea339277cbd6aed5aabf9

Code for my website

reorganise server startup

Alan Pearce
commit

6aa2452a44f15e72b72ea339277cbd6aed5aabf9

parent

752c646b28cd99e63784c261a4b92dc2625a7fe0

1 file changed, 8 insertions(+), 7 deletions(-)

jump to
M internal/server/server.gointernal/server/server.go
@@ -109,6 +109,9 @@ config, err := cfg.GetConfig()
if err != nil { return nil, errors.WithMessage(err, "error parsing configuration file") } + if runtimeConfig.Development { + applyDevModeOverrides(config, runtimeConfig.ListenAddress) + } listenAddress := net.JoinHostPort(runtimeConfig.ListenAddress, strconv.Itoa(runtimeConfig.Port)) top := http.NewServeMux()
@@ -119,9 +122,12 @@ Destination: runtimeConfig.Root,
Development: runtimeConfig.Development, } + err = rebuild(builderConfig, config) + if err != nil { + return nil, err + } + if runtimeConfig.Development { - applyDevModeOverrides(config, listenAddress) - liveReload := livereload.New() top.Handle("/_/reload", liveReload) liveReload.Start()
@@ -150,11 +156,6 @@ if err != nil {
log.Error("error rebuilding site", "error", err) } }) - } - - err = rebuild(builderConfig, config) - if err != nil { - return nil, err } loggingMux := http.NewServeMux()