Revert "Hotfix for https://github.com/opencloud-eu/opencloud/issues/2282"

This reverts commit 5e889612d6.

opencloud/cmd/opencloud/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"time"
 
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/command"
 )
@@ -13,10 +12,4 @@ func main() {
 		fmt.Fprintln(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	// INFO: this is a hotfix, we need to replace suture and wait for nats to
-	//       gracefully shutdown using rungroups
-	// 		 see https://github.com/opencloud-eu/opencloud/issues/2282
-	fmt.Println("Waiting for 30 seconds before exiting...")
-	time.Sleep(30 * time.Second)
-	fmt.Println("Exiting...")
 }

services/nats/pkg/command/server.go

@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"fmt"
 	"os/signal"
-	"time"
 
 	"github.com/urfave/cli/v2"
 
@@ -92,13 +91,7 @@ func Server(cfg *config.Config) *cli.Command {
 			gr.Add(runner.New(cfg.Service.Name+".svc", func() error {
 				return natsServer.ListenAndServe()
 			}, func() {
-				// INFO: this is a hotfix, we need to replace suture and wait for nats to
-				//       gracefully shutdown using rungroups
-				// 		 see https://github.com/opencloud-eu/opencloud/issues/2282
-				logger.Info().Msg("Gracefully shutting down the NATS server...")
 				natsServer.Shutdown()
-				time.Sleep(5 * time.Second) // wait for the server to shutdown gracefully
-				logger.Info().Msg("NATS server shutdown")
 			}))
 
 			grResults := gr.Run(ctx)