Merge branch 'main' into msc3861

Author: mdnight

setup/jetstream/nats.go

@@ -66,18 +66,21 @@ func (s *NATSInstance) Prepare(process *process.ProcessContext, cfg *config.JetS
 		if !cfg.NoLog {
 			s.SetLogger(NewLogAdapter(), opts.Debug, opts.Trace)
 		}
-		go func() {
-			process.ComponentStarted()
-			s.Start()
-		}()
+		process.ComponentStarted()
+		go s.Start()
 		go func() {
 			<-process.WaitForShutdown()
 			s.Shutdown()
 			s.WaitForShutdown()
 			process.ComponentFinished()
 		}()
 		if !s.ReadyForConnections(time.Second * 60) {
-			logrus.Fatalln("NATS did not start in time")
+			logrus.Fatalln("NATS did not start in time, shutting down")
+			process.ShutdownDendrite()
+			s.Shutdown()
+			s.WaitForShutdown()
+			process.ComponentFinished()
+			return nil, nil
 		}
 	}