tools-mirrors/hugo
0
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-06-29 04:09:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some recently introduced error handling issues

Browse source 
Updates #10953
This commit is contained in:
Bjørn Erik Pedersen 2023-05-18 10:36:48 +02:00
parent 1155bbca9d
commit 834b3d7e41
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
4 changed files with 72 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

21
commands/server.go
View file

@ -234,7 +234,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
// First check the error state
err := f.c.getErrorWithContext()
if err != nil {
f.c.errState.setWasErr(false)
f.c.errState.setWasErr(true)
w.WriteHeader(500)
r, err := f.errorTemplate(err)
if err != nil {
@ -242,8 +242,8 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
}
port = 1313
if !f.c.errState.isPaused() {
port = conf.configs.Base.Internal.LiveReloadPort
if lrport := conf.configs.GetFirstLanguageConfig().BaseURLLiveReload().Port(); lrport != 0 {
port = lrport
}
lr := *u
lr.Host = fmt.Sprintf("%s:%d", lr.Hostname(), port)
@ -432,9 +432,6 @@ func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
err := func() error {
defer c.r.timeTrack(time.Now(), "Built")
err := c.build()
if err != nil {
c.r.Println("Error:", err.Error())
}
return err
}()
if err != nil {
@ -703,8 +700,12 @@ func (c *serverCommand) partialReRender(urls ...string) error {
visited[url] = true
}
h, err := c.hugo()
if err != nil {
return err
}
// Note: We do not set NoBuildLock as the file lock is not acquired at this stage.
return c.hugo().Build(hugolib.BuildCfg{NoBuildLock: false, RecentlyVisited: visited, PartialReRender: true, ErrRecovery: c.errState.wasErr()})
return h.Build(hugolib.BuildCfg{NoBuildLock: false, RecentlyVisited: visited, PartialReRender: true, ErrRecovery: c.errState.wasErr()})
}
func (c *serverCommand) serve() error {
@ -877,8 +878,8 @@ type staticSyncer struct {
c *hugoBuilder
}
func (s *staticSyncer) isStatic(filename string) bool {
return s.c.hugo().BaseFs.SourceFilesystems.IsStatic(filename)
func (s *staticSyncer) isStatic(h *hugolib.HugoSites, filename string) bool {
return h.BaseFs.SourceFilesystems.IsStatic(filename)
}
func (s *staticSyncer) syncsStaticEvents(staticEvents []fsnotify.Event) error {
@ -1013,7 +1014,7 @@ func injectLiveReloadScript(src io.Reader, baseURL url.URL) string {
func partitionDynamicEvents(sourceFs *filesystems.SourceFilesystems, events []fsnotify.Event) (de dynamicEvents) {
for _, e := range events {
if sourceFs.IsAsset(e.Name) {
if !sourceFs.IsContent(e.Name) {
de.AssetEvents = append(de.AssetEvents, e)
} else {
de.ContentEvents = append(de.ContentEvents, e)