commands: Delay server builds after the watcher is set up

See #11264

diff --git a/commands/server.go b/commands/server.go
index 7e6ec5b13eeaca7ba2bfb2f231f6f3d7259922e9..bf82b748de9a703944f48e535c7dae1291f39c9c 100644 (file)
--- a/commands/server.go
+++ b/commands/server.go
@@ -470,14 +470,6 @@ func (c *serverCommand) Name() string {
 }
 
 func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, args []string) error {
-       err := func() error {
-               defer c.r.timeTrack(time.Now(), "Built")
-               err := c.build()
-               return err
-       }()
-       if err != nil {
-               return err
-       }
 
        // Watch runs its own server as part of the routine
        if c.serverWatch {
@@ -501,6 +493,15 @@ func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
 
        }
 
+       err := func() error {
+               defer c.r.timeTrack(time.Now(), "Built")
+               err := c.build()
+               return err
+       }()
+       if err != nil {
+               return err
+       }
+
        return c.serve()
 }