diff options
author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
commit | eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa (patch) | |
tree | ed01fd9488bd86f6c2daf0b299dff5beb43973db /store/storetest | |
parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
parent | 2e6b3da1d3466db379fef0d61a23e2878d17ee9d (diff) | |
download | chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.gz chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.bz2 chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.zip |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'store/storetest')
-rw-r--r-- | store/storetest/docker.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/store/storetest/docker.go b/store/storetest/docker.go index cd2a3075a..f3830a6fe 100644 --- a/store/storetest/docker.go +++ b/store/storetest/docker.go @@ -12,8 +12,7 @@ import ( "strings" "time" - l4g "github.com/alecthomas/log4go" - + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" ) @@ -31,7 +30,7 @@ type RunningContainer struct { } func (c *RunningContainer) Stop() error { - l4g.Info("Removing container: %v", c.Id) + mlog.Info(fmt.Sprintf("Removing container: %v", c.Id)) return exec.Command("docker", "rm", "-f", c.Id).Run() } @@ -47,7 +46,7 @@ func NewMySQLContainer() (*RunningContainer, *model.SqlSettings, error) { if err != nil { return nil, nil, err } - l4g.Info("Waiting for mysql connectivity") + mlog.Info("Waiting for mysql connectivity") port := container.NetworkSettings.Ports["3306/tcp"][0].HostPort if err := waitForPort(port); err != nil { container.Stop() @@ -66,7 +65,7 @@ func NewPostgreSQLContainer() (*RunningContainer, *model.SqlSettings, error) { if err != nil { return nil, nil, err } - l4g.Info("Waiting for postgres connectivity") + mlog.Info("Waiting for postgres connectivity") port := container.NetworkSettings.Ports["5432/tcp"][0].HostPort if err := waitForPort(port); err != nil { container.Stop() @@ -111,7 +110,7 @@ func runContainer(args []string) (*RunningContainer, error) { exec.Command("docker", "rm", "-f", id).Run() return nil, err } - l4g.Info("Running container: %v", id) + mlog.Info(fmt.Sprintf("Running container: %v", id)) return &RunningContainer{containers[0]}, nil } |