mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
commands: Revert the recent changes that allowed profiling on server rebuilds
There have been indications that this may freeze the server.
This commit is contained in:
parent
9c6d377872
commit
c37bf19c89
3 changed files with 13 additions and 15 deletions
|
@ -339,11 +339,10 @@ func (r *rootCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, args
|
|||
if r.buildWatch {
|
||||
defer r.timeTrack(time.Now(), "Built")
|
||||
}
|
||||
close, err := b.build()
|
||||
err := b.build()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
close()
|
||||
return nil
|
||||
}()
|
||||
if err != nil {
|
||||
|
|
|
@ -361,32 +361,34 @@ func (c *hugoBuilder) newWatcher(pollIntervalStr string, dirList ...string) (*wa
|
|||
return watcher, nil
|
||||
}
|
||||
|
||||
func (c *hugoBuilder) build() (func(), error) {
|
||||
func (c *hugoBuilder) build() error {
|
||||
stopProfiling, err := c.initProfiling()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return err
|
||||
}
|
||||
|
||||
defer func() {
|
||||
if stopProfiling != nil {
|
||||
stopProfiling()
|
||||
}
|
||||
}()
|
||||
|
||||
if err := c.fullBuild(false); err != nil {
|
||||
return nil, err
|
||||
return err
|
||||
}
|
||||
|
||||
if !c.r.quiet {
|
||||
c.r.Println()
|
||||
h, err := c.hugo()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return err
|
||||
}
|
||||
|
||||
h.PrintProcessingStats(os.Stdout)
|
||||
c.r.Println()
|
||||
}
|
||||
|
||||
return func() {
|
||||
if stopProfiling != nil {
|
||||
stopProfiling()
|
||||
}
|
||||
}, nil
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *hugoBuilder) buildSites(noBuildLock bool) (err error) {
|
||||
|
|
|
@ -495,19 +495,16 @@ func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
|
|||
|
||||
}
|
||||
|
||||
var close func()
|
||||
err := func() error {
|
||||
defer c.r.timeTrack(time.Now(), "Built")
|
||||
var err error
|
||||
close, err = c.build()
|
||||
err = c.build()
|
||||
return err
|
||||
}()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer close()
|
||||
|
||||
return c.serve()
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue