Structured logging (#8673)
* Implementing structured logging * Changes to en.json to allow refactor to run. * Fixing global logger * Structured logger initalization. * Add caller. * Do some log redirection. * Auto refactor * Cleaning up l4g reference and removing dependancy. * Removing junk. * Copyright headers. * Fixing tests * Revert "Changes to en.json to allow refactor to run." This reverts commit fd8249e99bcad0231e6ea65cd77c32aae9a54026. * Fixing some auto refactor strangeness and typo. * Making keys more human readable.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
2acbc77d78
Коммит
686c2fbab7
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user