commands: Revert the recent changes that allowed profiling on server rebuilds

There have been indications that this may freeze the server.

diff --git a/commands/commandeer.go b/commands/commandeer.go
index 82d684153a52e47621c974c13a7c76dabddcf021..1e5928ff97bb38055873f06a64b1a86994cebe1b 100644 (file)
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -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 {

diff --git a/commands/hugobuilder.go b/commands/hugobuilder.go
index 6ae9640b08c7b9da8465de705e657c3b0c9c1c0a..f5bc730873a51daa0a1f631425a79416fcd54e50 100644 (file)
--- a/commands/hugobuilder.go
+++ b/commands/hugobuilder.go
@@ -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) {

diff --git a/commands/server.go b/commands/server.go
index e803d48249e5541cffd9f5d9ea7b32542ee5005e..bdf6e905a26f0f100324544cbddffe8967dccc5c 100644 (file)
--- a/commands/server.go
+++ b/commands/server.go
@@ -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()
 }