* Moving mlog to corelibs

* Regenerating app layers

* Fix golangci-lint problem

* Fixing golangci-lint errors

* Renaming from corelibs to shared

* Renaming from corelibs to shared

* Fixing import

* Fixing merge problems

* Fixing build
Этот коммит содержится в:
Jesús Espino
2021-03-05 09:18:37 +01:00
коммит произвёл GitHub
родитель b3498a1edf
Коммит 9cc5089af8
212 изменённых файлов: 194 добавлений и 195 удалений

Просмотреть файл

@@ -17,8 +17,8 @@ import (
"github.com/aws/aws-sdk-go/service/marketplacemetering/marketplacemeteringiface"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v5/store"
)

Просмотреть файл

@@ -6,7 +6,7 @@ package docextractor
import (
"io"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
type combineExtractor struct {

Просмотреть файл

@@ -11,10 +11,10 @@ import (
"strings"
"sync"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/configservice"
"github.com/mattermost/mattermost-server/v5/services/httpservice"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
var ErrNotEnabled = Error{errors.New("imageproxy.ImageProxy: image proxy not enabled")}

Просмотреть файл

@@ -16,8 +16,8 @@ import (
"willnorris.com/go/imageproxy"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/services/httpservice"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
var imageContentTypes = []string{

Просмотреть файл

@@ -17,7 +17,7 @@ import (
"github.com/pkg/errors"
gomail "gopkg.in/mail.v2"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
const (

Просмотреть файл

@@ -18,8 +18,8 @@ import (
"github.com/blevesearch/bleve/mapping"
"github.com/mattermost/mattermost-server/v5/jobs"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
const (

Просмотреть файл

@@ -12,9 +12,9 @@ import (
"github.com/mattermost/mattermost-server/v5/app"
"github.com/mattermost/mattermost-server/v5/jobs"
tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/services/searchengine/bleveengine"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
const (

Просмотреть файл

@@ -10,8 +10,8 @@ import (
"github.com/blevesearch/bleve"
"github.com/blevesearch/bleve/search/query"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
const DeletePostsBatchSize = 500

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"strconv"
"strings"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
func slackConvertTimeStamp(ts string) int64 {

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"os"
"testing"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
func TestMain(m *testing.M) {

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"encoding/json"
"io"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
func slackParseChannels(data io.Reader, channelType string) ([]slackChannel, error) {

Просмотреть файл

@@ -17,9 +17,9 @@ import (
"time"
"unicode/utf8"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/i18n"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v5/store"
"github.com/mattermost/mattermost-server/v5/utils"
)

Просмотреть файл

@@ -12,12 +12,12 @@ import (
rudder "github.com/rudderlabs/analytics-go"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin"
"github.com/mattermost/mattermost-server/v5/services/httpservice"
"github.com/mattermost/mattermost-server/v5/services/marketplace"
"github.com/mattermost/mattermost-server/v5/services/searchengine"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
"github.com/mattermost/mattermost-server/v5/store"
"github.com/mattermost/mattermost-server/v5/utils"
)

Просмотреть файл

@@ -18,13 +18,13 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin"
"github.com/mattermost/mattermost-server/v5/plugin/plugintest"
"github.com/mattermost/mattermost-server/v5/services/httpservice"
"github.com/mattermost/mattermost-server/v5/services/searchengine"
"github.com/mattermost/mattermost-server/v5/services/telemetry/mocks"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
storeMocks "github.com/mattermost/mattermost-server/v5/store/storetest/mocks"
)

Просмотреть файл

@@ -14,7 +14,7 @@ import (
"github.com/uber/jaeger-client-go/zipkin"
"github.com/uber/jaeger-lib/metrics"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
// Tracer is a wrapper around Jaeger OpenTracing client, used to properly de-initialize jaeger on exit

Просмотреть файл

@@ -23,8 +23,8 @@ import (
"github.com/pkg/errors"
"golang.org/x/crypto/openpgp"
"github.com/mattermost/mattermost-server/v5/mlog"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/shared/mlog"
)
const mattermostBuildPublicKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----