Added shutdown method to containers.

This commit is contained in:
mikestefanello 2021-12-19 14:56:00 -05:00
parent 85981e75a7
commit 40f0d7251d
5 changed files with 28 additions and 8 deletions

View File

@ -3,10 +3,18 @@ package config
import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestGetConfig(t *testing.T) {
_, err := GetConfig()
require.NoError(t, err)
var env Environment
env = "abc"
SwitchEnvironment(env)
cfg, err := GetConfig()
require.NoError(t, err)
assert.Equal(t, env, cfg.App.Environment)
}

View File

@ -32,12 +32,14 @@ func TestMain(m *testing.M) {
// Create a new container
c = services.NewContainer()
defer func() {
if err := c.Shutdown(); err != nil {
c.Web.Logger.Fatal(err)
}
}()
// Run tests
exitVal := m.Run()
if err := c.Shutdown(); err != nil {
panic(err)
}
os.Exit(exitVal)
}

View File

@ -13,7 +13,13 @@ import (
)
func main() {
// Start a new container
c := services.NewContainer()
defer func() {
if err := c.Shutdown(); err != nil {
c.Web.Logger.Fatal(err)
}
}()
// Build the router
routes.BuildRouter(c)

View File

@ -54,7 +54,7 @@ func ServeCachedPage(ch *cache.Cache) echo.MiddlewareFunc {
c.Response().Header().Set(k, v)
}
}
c.Logger().Infof("serving cached page")
c.Logger().Info("serving cached page")
return c.HTMLBlob(page.StatusCode, page.HTML)
}

View File

@ -25,17 +25,21 @@ func TestMain(m *testing.M) {
// Set the environment to test
config.SwitchEnvironment(config.EnvTest)
// Start a test HTTP server
// Start a new container
c = services.NewContainer()
defer func() {
if err := c.Shutdown(); err != nil {
c.Web.Logger.Fatal(err)
}
}()
// Start a test HTTP server
BuildRouter(c)
srv = httptest.NewServer(c.Web)
// Run tests
exitVal := m.Run()
srv.Close()
if err := c.Shutdown(); err != nil {
panic(err)
}
os.Exit(exitVal)
}