PLT-6080 moving clustering to memberlist (#6499)
* PLT-6080 adding cluster discovery service * Adding memberlist lib * Adding memberlist lib * WIP * WIP * WIP * WIP * Rolling back config changes * Fixing make file * Fixing config for cluster * WIP * Fixing system console for clustering * Fixing default config * Fixing config * Fixing system console for clustering * Tweaking hub setting * Bumping up time * merging vendor dir * Updating vendor dir * Fixing unit test * Fixing bad merge * Remove some testing code * Moving comment * PLT-6868 adding db ping retry * Removing unused loc strings * Adding defer to cancel
Этот коммит содержится в:
@@ -6,6 +6,7 @@ package utils
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/mattermost/platform/model"
|
||||
)
|
||||
@@ -59,7 +60,25 @@ func TestConfigFromEnviroVars(t *testing.T) {
|
||||
if Cfg.TeamSettings.SiteName != "Mattermost" {
|
||||
t.Fatal("should have been reset")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRedirectStdLog(t *testing.T) {
|
||||
TranslationsPreInit()
|
||||
LoadConfig("config.json")
|
||||
InitTranslations(Cfg.LocalizationSettings)
|
||||
|
||||
log := NewRedirectStdLog("test", false)
|
||||
|
||||
log.Println("[DEBUG] this is a message")
|
||||
log.Println("[DEBG] this is a message")
|
||||
log.Println("[WARN] this is a message")
|
||||
log.Println("[ERROR] this is a message")
|
||||
log.Println("[EROR] this is a message")
|
||||
log.Println("[ERR] this is a message")
|
||||
log.Println("[INFO] this is a message")
|
||||
log.Println("this is a message")
|
||||
|
||||
time.Sleep(time.Second * 1)
|
||||
}
|
||||
|
||||
func TestAddRemoveConfigListener(t *testing.T) {
|
||||
|
||||
65
utils/redirect_std_log.go
Обычный файл
65
utils/redirect_std_log.go
Обычный файл
@@ -0,0 +1,65 @@
|
||||
// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
package utils
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"log"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
l4g "github.com/alecthomas/log4go"
|
||||
)
|
||||
|
||||
type RedirectStdLog struct {
|
||||
reader *os.File
|
||||
writer *os.File
|
||||
system string
|
||||
ignoreDebug bool
|
||||
}
|
||||
|
||||
func NewRedirectStdLog(system string, ignoreDebug bool) *log.Logger {
|
||||
r, w, _ := os.Pipe()
|
||||
logger := &RedirectStdLog{
|
||||
reader: r,
|
||||
writer: w,
|
||||
system: system,
|
||||
ignoreDebug: ignoreDebug,
|
||||
}
|
||||
|
||||
go func(l *RedirectStdLog) {
|
||||
scanner := bufio.NewScanner(l.reader)
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
|
||||
if strings.Index(line, "[DEBUG]") == 0 {
|
||||
if !ignoreDebug {
|
||||
l4g.Debug("%v%v", system, line[7:])
|
||||
}
|
||||
} else if strings.Index(line, "[DEBG]") == 0 {
|
||||
if !ignoreDebug {
|
||||
l4g.Debug("%v%v", system, line[6:])
|
||||
}
|
||||
} else if strings.Index(line, "[WARN]") == 0 {
|
||||
l4g.Info("%v%v", system, line[6:])
|
||||
} else if strings.Index(line, "[ERROR]") == 0 {
|
||||
l4g.Error("%v%v", system, line[7:])
|
||||
} else if strings.Index(line, "[EROR]") == 0 {
|
||||
l4g.Error("%v%v", system, line[6:])
|
||||
} else if strings.Index(line, "[ERR]") == 0 {
|
||||
l4g.Error("%v%v", system, line[5:])
|
||||
} else if strings.Index(line, "[INFO]") == 0 {
|
||||
l4g.Info("%v%v", system, line[6:])
|
||||
} else {
|
||||
l4g.Info("%v %v", system, line)
|
||||
}
|
||||
}
|
||||
}(logger)
|
||||
|
||||
return log.New(logger.writer, "", 0)
|
||||
}
|
||||
|
||||
func (l *RedirectStdLog) Write(p []byte) (n int, err error) {
|
||||
return l.writer.Write(p)
|
||||
}
|
||||
Ссылка в новой задаче
Block a user