Added shutdown method to container.

Makefile

@@ -35,4 +35,4 @@ run:
 
 .PHONY: test
 test:
-	go test ./...
+	go test -p 1 ./...

controller/controller_test.go

@@ -35,6 +35,9 @@ func TestMain(m *testing.M) {
 
 	// Run tests
 	exitVal := m.Run()
+	if err := c.Shutdown(); err != nil {
+		panic(err)
+	}
 	os.Exit(exitVal)
 }
 

routes/routes_test.go

@@ -33,6 +33,9 @@ func TestMain(m *testing.M) {
 	// Run tests
 	exitVal := m.Run()
 	srv.Close()
+	if err := c.Shutdown(); err != nil {
+		panic(err)
+	}
 	os.Exit(exitVal)
 }
 

services/container.go

@@ -24,6 +24,7 @@ type Container struct {
 	Web         *echo.Echo
 	Config      *config.Config
 	Cache       *cache.Cache
+	cacheClient *redis.Client
 	Database    *sql.DB
 	ORM         *ent.Client
 	Mail        *mail.Client
@@ -42,6 +43,20 @@ func NewContainer() *Container {
 	return c
 }
 
+func (c *Container) Shutdown() error {
+	if err := c.cacheClient.Close(); err != nil {
+		return err
+	}
+	if err := c.ORM.Close(); err != nil {
+		return err
+	}
+	if err := c.Database.Close(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (c *Container) initConfig() {
 	cfg, err := config.GetConfig()
 	if err != nil {
@@ -63,14 +78,14 @@ func (c *Container) initWeb() {
 }
 
 func (c *Container) initCache() {
-	cacheClient := redis.NewClient(&redis.Options{
+	c.cacheClient = redis.NewClient(&redis.Options{
 		Addr:     fmt.Sprintf("%s:%d", c.Config.Cache.Hostname, c.Config.Cache.Port),
 		Password: c.Config.Cache.Password,
 	})
-	if _, err := cacheClient.Ping(context.Background()).Result(); err != nil {
+	if _, err := c.cacheClient.Ping(context.Background()).Result(); err != nil {
 		panic(fmt.Sprintf("failed to connect to cache server: %v", err))
 	}
-	cacheStore := store.NewRedis(cacheClient, nil)
+	cacheStore := store.NewRedis(c.cacheClient, nil)
 	c.Cache = cache.New(cacheStore)
 }
 

services/services_test.go

@@ -48,5 +48,8 @@ func TestMain(m *testing.M) {
 
 	// Run tests
 	exitVal := m.Run()
+	if err := c.Shutdown(); err != nil {
+		panic(err)
+	}
 	os.Exit(exitVal)
 }