diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 49a4b0405b..8fdfb56efd 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -23,9 +23,9 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "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/store/localcachelayer" "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" diff --git a/api4/channel.go b/api4/channel.go index bcc1a5a870..77ef57a2f5 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -11,8 +11,8 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func (api *API) InitChannel() { diff --git a/api4/channel_category.go b/api4/channel_category.go index 1a716ece23..eb158fe7f7 100644 --- a/api4/channel_category.go +++ b/api4/channel_category.go @@ -7,8 +7,8 @@ import ( "net/http" "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func getCategoriesForTeamForUser(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/config.go b/api4/config.go index 6795956f2d..fdc30e2828 100644 --- a/api4/config.go +++ b/api4/config.go @@ -11,8 +11,8 @@ import ( "github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v5/config" - "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/utils" ) diff --git a/api4/main_test.go b/api4/main_test.go index 403c22b5db..6ba97433ad 100644 --- a/api4/main_test.go +++ b/api4/main_test.go @@ -6,7 +6,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/testlib" ) diff --git a/api4/plugin.go b/api4/plugin.go index 71d78710a9..521376755c 100644 --- a/api4/plugin.go +++ b/api4/plugin.go @@ -14,8 +14,8 @@ import ( "strconv" "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/api4/post.go b/api4/post.go index bc5da070c8..6291f9cf8e 100644 --- a/api4/post.go +++ b/api4/post.go @@ -11,8 +11,8 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func (api *API) InitPost() { diff --git a/api4/system.go b/api4/system.go index 543926689a..a401331313 100644 --- a/api4/system.go +++ b/api4/system.go @@ -18,10 +18,10 @@ import ( "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v5/audit" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/cache" "github.com/mattermost/mattermost-server/v5/services/upgrader" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/api4/system_test.go b/api4/system_test.go index 17bd2fe01f..91b0bc7d83 100644 --- a/api4/system_test.go +++ b/api4/system_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/assert" "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/shared/mlog" ) func TestGetPing(t *testing.T) { diff --git a/api4/user.go b/api4/user.go index 3490e0fd75..6939804a84 100644 --- a/api4/user.go +++ b/api4/user.go @@ -15,8 +15,8 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/audit" - "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" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/admin.go b/app/admin.go index 7a8cb78267..3a5f04f91f 100644 --- a/app/admin.go +++ b/app/admin.go @@ -13,10 +13,10 @@ import ( "runtime/debug" "time" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/mailservice" "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/analytics.go b/app/analytics.go index 7796971310..96e33785b7 100644 --- a/app/analytics.go +++ b/app/analytics.go @@ -8,8 +8,8 @@ import ( "golang.org/x/sync/errgroup" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/app/app.go b/app/app.go index 4f76bc921b..804fa1c1fb 100644 --- a/app/app.go +++ b/app/app.go @@ -13,7 +13,6 @@ import ( "time" "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/httpservice" "github.com/mattermost/mattermost-server/v5/services/imageproxy" @@ -21,6 +20,7 @@ import ( "github.com/mattermost/mattermost-server/v5/services/searchengine" "github.com/mattermost/mattermost-server/v5/services/timezones" "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/app_iface.go b/app/app_iface.go index 19c9f0e598..38f79310a8 100644 --- a/app/app_iface.go +++ b/app/app_iface.go @@ -20,7 +20,6 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" "github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v5/einterfaces" - "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" @@ -29,6 +28,7 @@ import ( "github.com/mattermost/mattermost-server/v5/services/timezones" "github.com/mattermost/mattermost-server/v5/shared/filestore" "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/app/audit.go b/app/audit.go index bf3c1448b9..ffd21df768 100644 --- a/app/audit.go +++ b/app/audit.go @@ -13,8 +13,8 @@ import ( "github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v5/config" - "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" ) diff --git a/app/authorization.go b/app/authorization.go index 162dab2966..5e44178954 100644 --- a/app/authorization.go +++ b/app/authorization.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func (a *App) MakePermissionError(permissions []*model.Permission) *model.AppError { diff --git a/app/bot.go b/app/bot.go index 659543f8a8..4809cd17a9 100644 --- a/app/bot.go +++ b/app/bot.go @@ -11,9 +11,9 @@ import ( "mime/multipart" "net/http" - "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" ) diff --git a/app/channel.go b/app/channel.go index 5d057108bd..2d6d138d3f 100644 --- a/app/channel.go +++ b/app/channel.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "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/shared/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/channel_category.go b/app/channel_category.go index 02fc48e9da..48bc3901cb 100644 --- a/app/channel_category.go +++ b/app/channel_category.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" - "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" ) diff --git a/app/cloud.go b/app/cloud.go index 33137deee8..38ed8c81d6 100644 --- a/app/cloud.go +++ b/app/cloud.go @@ -8,8 +8,8 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func (a *App) getSysAdminsEmailRecipients() ([]*model.User, *model.AppError) { diff --git a/app/cluster_discovery.go b/app/cluster_discovery.go index 63cab64b7b..6a8c6a6812 100644 --- a/app/cluster_discovery.go +++ b/app/cluster_discovery.go @@ -6,8 +6,8 @@ package app import ( "time" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/app/command.go b/app/command.go index 0f3c017ea5..518363b292 100644 --- a/app/command.go +++ b/app/command.go @@ -14,9 +14,9 @@ import ( "sync" "unicode" - "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" ) diff --git a/app/command_autocomplete.go b/app/command_autocomplete.go index 676efd2eee..1ccf440dcb 100644 --- a/app/command_autocomplete.go +++ b/app/command_autocomplete.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // AutocompleteDynamicArgProvider dynamically provides auto-completion args for built-in commands. diff --git a/app/config.go b/app/config.go index 7032c7d1d4..4ba2cbd0fa 100644 --- a/app/config.go +++ b/app/config.go @@ -20,9 +20,9 @@ import ( "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/mailservice" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/email.go b/app/email.go index 9323e0ab92..e5af249ec7 100644 --- a/app/email.go +++ b/app/email.go @@ -18,10 +18,10 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/mailservice" "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/email_batching.go b/app/email_batching.go index 1a57a21224..31f2054d90 100644 --- a/app/email_batching.go +++ b/app/email_batching.go @@ -12,9 +12,9 @@ import ( "sync" "time" - "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/utils" ) diff --git a/app/emoji.go b/app/emoji.go index 5d1492f971..1b56156007 100644 --- a/app/emoji.go +++ b/app/emoji.go @@ -21,8 +21,8 @@ import ( "github.com/disintegration/imaging" - "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" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/enterprise.go b/app/enterprise.go index f61f7e3ea4..19884d2dbf 100644 --- a/app/enterprise.go +++ b/app/enterprise.go @@ -7,9 +7,9 @@ import ( "github.com/mattermost/mattermost-server/v5/einterfaces" ejobs "github.com/mattermost/mattermost-server/v5/einterfaces/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" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) var accountMigrationInterface func(*App) einterfaces.AccountMigrationInterface diff --git a/app/expirynotify.go b/app/expirynotify.go index 36ffc373aa..97e79419c6 100644 --- a/app/expirynotify.go +++ b/app/expirynotify.go @@ -6,9 +6,9 @@ package app import ( "net/http" - "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" ) const ( diff --git a/app/export.go b/app/export.go index 0ef85df080..0b681f8b1e 100644 --- a/app/export.go +++ b/app/export.go @@ -15,8 +15,8 @@ import ( "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" ) diff --git a/app/extract_plugin_tar.go b/app/extract_plugin_tar.go index d3461a3257..b81a4552cb 100644 --- a/app/extract_plugin_tar.go +++ b/app/extract_plugin_tar.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // extractTarGz takes in an io.Reader containing the bytes for a .tar.gz file and diff --git a/app/feature_flags.go b/app/feature_flags.go index bb2d5db7b5..0534714fb3 100644 --- a/app/feature_flags.go +++ b/app/feature_flags.go @@ -9,7 +9,7 @@ import ( "time" "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // setupFeatureFlags called on startup and when the cluster leader changes. diff --git a/app/file.go b/app/file.go index 9fa8555ad3..d3deaa1ef0 100644 --- a/app/file.go +++ b/app/file.go @@ -33,11 +33,11 @@ import ( _ "golang.org/x/image/bmp" _ "golang.org/x/image/tiff" - "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/docextractor" "github.com/mattermost/mattermost-server/v5/shared/filestore" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/file_bench_test.go b/app/file_bench_test.go index aa4d392b9d..87d7f99748 100644 --- a/app/file_bench_test.go +++ b/app/file_bench_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) var randomJPEG []byte diff --git a/app/helper_test.go b/app/helper_test.go index 304ab2b0d9..33116dd090 100644 --- a/app/helper_test.go +++ b/app/helper_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/require" "github.com/mattermost/mattermost-server/v5/config" - "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" "github.com/mattermost/mattermost-server/v5/store/localcachelayer" "github.com/mattermost/mattermost-server/v5/store/sqlstore" diff --git a/app/import.go b/app/import.go index dc5323856a..fd6a2233ef 100644 --- a/app/import.go +++ b/app/import.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/app/import_functions.go b/app/import_functions.go index 81765ac831..960c9520ba 100644 --- a/app/import_functions.go +++ b/app/import_functions.go @@ -15,8 +15,8 @@ import ( "path" "strings" - "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" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/integration_action.go b/app/integration_action.go index 5b2612066e..7187524687 100644 --- a/app/integration_action.go +++ b/app/integration_action.go @@ -32,9 +32,9 @@ import ( "github.com/gorilla/mux" - "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" ) diff --git a/app/ldap.go b/app/ldap.go index 49a17874a9..ec32a5758f 100644 --- a/app/ldap.go +++ b/app/ldap.go @@ -8,9 +8,9 @@ import ( "mime/multipart" "net/http" - "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" ) func (a *App) SyncLdap() { diff --git a/app/license.go b/app/license.go index 6719ce12cd..7a5cd36d50 100644 --- a/app/license.go +++ b/app/license.go @@ -13,8 +13,8 @@ import ( "github.com/dgrijalva/jwt-go" "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/utils" ) diff --git a/app/login.go b/app/login.go index 5e823820da..18765958db 100644 --- a/app/login.go +++ b/app/login.go @@ -15,9 +15,9 @@ import ( "github.com/avct/uasurfer" - "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/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/main_test.go b/app/main_test.go index 1a24e6d267..35fdd6b1bb 100644 --- a/app/main_test.go +++ b/app/main_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/testlib" ) diff --git a/app/migrations.go b/app/migrations.go index 44c807b3c6..33bc7bde01 100644 --- a/app/migrations.go +++ b/app/migrations.go @@ -7,8 +7,8 @@ import ( "fmt" "reflect" - "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/utils" ) diff --git a/app/notification.go b/app/notification.go index c776eaa953..b7b86fa460 100644 --- a/app/notification.go +++ b/app/notification.go @@ -13,9 +13,9 @@ import ( "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/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v5/utils/markdown" ) diff --git a/app/notification_email.go b/app/notification_email.go index 3b33daeab8..81fc15e350 100644 --- a/app/notification_email.go +++ b/app/notification_email.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "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/utils" ) diff --git a/app/notification_push.go b/app/notification_push.go index 988579e8af..24ed7400c3 100644 --- a/app/notification_push.go +++ b/app/notification_push.go @@ -13,9 +13,9 @@ import ( "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/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type notificationType string diff --git a/app/oauth.go b/app/oauth.go index f289de3aaf..ae2668687b 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -18,9 +18,9 @@ import ( "time" "github.com/mattermost/mattermost-server/v5/einterfaces" - "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" ) diff --git a/app/opengraph.go b/app/opengraph.go index dcce4d4294..773221a278 100644 --- a/app/opengraph.go +++ b/app/opengraph.go @@ -11,7 +11,7 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" "golang.org/x/net/html/charset" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const MaxOpenGraphResponseSize = 1024 * 1024 * 50 diff --git a/app/opentracing/opentracing_layer.go b/app/opentracing/opentracing_layer.go index df02902371..7380be7238 100644 --- a/app/opentracing/opentracing_layer.go +++ b/app/opentracing/opentracing_layer.go @@ -21,7 +21,6 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v5/einterfaces" - "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" @@ -31,6 +30,7 @@ import ( "github.com/mattermost/mattermost-server/v5/services/tracing" "github.com/mattermost/mattermost-server/v5/shared/filestore" "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/opentracing/opentracing-go/ext" spanlog "github.com/opentracing/opentracing-go/log" diff --git a/app/options.go b/app/options.go index b5c88a22d8..54c111214e 100644 --- a/app/options.go +++ b/app/options.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v5/config" - "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" ) diff --git a/app/plugin.go b/app/plugin.go index e92b766af5..e168cddfe9 100644 --- a/app/plugin.go +++ b/app/plugin.go @@ -20,11 +20,11 @@ import ( svg "github.com/h2non/go-is-svg" "github.com/pkg/errors" - "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/marketplace" "github.com/mattermost/mattermost-server/v5/shared/filestore" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) diff --git a/app/plugin_api.go b/app/plugin_api.go index 3b40613ac7..d71f1c6d19 100644 --- a/app/plugin_api.go +++ b/app/plugin_api.go @@ -14,9 +14,9 @@ import ( "path/filepath" "strings" - "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" ) type PluginAPI struct { diff --git a/app/plugin_install.go b/app/plugin_install.go index c828baeec3..a30065bed8 100644 --- a/app/plugin_install.go +++ b/app/plugin_install.go @@ -48,9 +48,9 @@ import ( "github.com/blang/semver" "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/filestore" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/plugin_key_value_store.go b/app/plugin_key_value_store.go index e3b519d8f0..ce9feb18e1 100644 --- a/app/plugin_key_value_store.go +++ b/app/plugin_key_value_store.go @@ -9,8 +9,8 @@ import ( "errors" "net/http" - "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" ) diff --git a/app/plugin_requests.go b/app/plugin_requests.go index c8b335bad7..67775c5309 100644 --- a/app/plugin_requests.go +++ b/app/plugin_requests.go @@ -14,9 +14,9 @@ import ( "github.com/gorilla/mux" - "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/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/plugin_signature.go b/app/plugin_signature.go index 8cc9c2ad4d..c550973648 100644 --- a/app/plugin_signature.go +++ b/app/plugin_signature.go @@ -14,8 +14,8 @@ import ( "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/armor" - "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/utils" ) diff --git a/app/plugin_test.go b/app/plugin_test.go index 65f7566aba..ea5a8d411b 100644 --- a/app/plugin_test.go +++ b/app/plugin_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "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/shared/mlog" "github.com/mattermost/mattermost-server/v5/testlib" "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) diff --git a/app/post.go b/app/post.go index 23a65051e3..fc6f94d8c8 100644 --- a/app/post.go +++ b/app/post.go @@ -13,11 +13,11 @@ import ( "sync" "time" - "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/cache" "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/app/post_metadata.go b/app/post_metadata.go index 8f75ec220b..e32896ded5 100644 --- a/app/post_metadata.go +++ b/app/post_metadata.go @@ -16,9 +16,9 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/cache" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils/imgutils" "github.com/mattermost/mattermost-server/v5/utils/markdown" ) diff --git a/app/post_test.go b/app/post_test.go index 4c1f1b1c2e..552906b9f1 100644 --- a/app/post_test.go +++ b/app/post_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/assert" "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/plugintest/mock" "github.com/mattermost/mattermost-server/v5/services/imageproxy" "github.com/mattermost/mattermost-server/v5/services/searchengine/mocks" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store/storetest" storemocks "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" "github.com/mattermost/mattermost-server/v5/testlib" diff --git a/app/product_notices.go b/app/product_notices.go index 5179ff0093..ed81e9a34e 100644 --- a/app/product_notices.go +++ b/app/product_notices.go @@ -16,8 +16,8 @@ import ( date_constraints "github.com/reflog/dateconstraints" "github.com/mattermost/mattermost-server/v5/config" - "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" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/ratelimit.go b/app/ratelimit.go index 3518796856..9260a09b8f 100644 --- a/app/ratelimit.go +++ b/app/ratelimit.go @@ -13,9 +13,9 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" - "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/utils" ) diff --git a/app/security_update_check.go b/app/security_update_check.go index c634907363..f0969cc5fe 100644 --- a/app/security_update_check.go +++ b/app/security_update_check.go @@ -10,10 +10,10 @@ import ( "runtime" "strconv" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/mailservice" "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/app/server.go b/app/server.go index 370c80de71..46c4c0598b 100644 --- a/app/server.go +++ b/app/server.go @@ -39,7 +39,6 @@ import ( "github.com/mattermost/mattermost-server/v5/config" "github.com/mattermost/mattermost-server/v5/einterfaces" "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/plugin" "github.com/mattermost/mattermost-server/v5/services/awsmeter" @@ -55,6 +54,7 @@ import ( "github.com/mattermost/mattermost-server/v5/services/upgrader" "github.com/mattermost/mattermost-server/v5/shared/filestore" "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/store/localcachelayer" "github.com/mattermost/mattermost-server/v5/store/retrylayer" diff --git a/app/server_test.go b/app/server_test.go index b447a4da96..3648d89c93 100644 --- a/app/server_test.go +++ b/app/server_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/require" "github.com/mattermost/mattermost-server/v5/config" - "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/storetest" "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) diff --git a/app/session.go b/app/session.go index 717b2588d7..b9f97f28ed 100644 --- a/app/session.go +++ b/app/session.go @@ -14,8 +14,8 @@ import ( "time" "github.com/mattermost/mattermost-server/v5/audit" - "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" ) diff --git a/app/slashcommands/command_custom_status.go b/app/slashcommands/command_custom_status.go index 4a61007a01..65b53d3707 100644 --- a/app/slashcommands/command_custom_status.go +++ b/app/slashcommands/command_custom_status.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/mattermost/mattermost-server/v5/app" - "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" ) type CustomStatusProvider struct { diff --git a/app/slashcommands/command_echo.go b/app/slashcommands/command_echo.go index dc06300743..2b24c3268f 100644 --- a/app/slashcommands/command_echo.go +++ b/app/slashcommands/command_echo.go @@ -9,9 +9,9 @@ import ( "time" "github.com/mattermost/mattermost-server/v5/app" - "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" ) var echoSem chan bool diff --git a/app/slashcommands/command_groupmsg.go b/app/slashcommands/command_groupmsg.go index 307ac99cea..d48aabe955 100644 --- a/app/slashcommands/command_groupmsg.go +++ b/app/slashcommands/command_groupmsg.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/mattermost/mattermost-server/v5/app" - "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" ) type groupmsgProvider struct { diff --git a/app/slashcommands/command_invite.go b/app/slashcommands/command_invite.go index 4b54b5e833..caa02266fc 100644 --- a/app/slashcommands/command_invite.go +++ b/app/slashcommands/command_invite.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/mattermost/mattermost-server/v5/app" - "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" ) type InviteProvider struct { diff --git a/app/slashcommands/command_invite_people.go b/app/slashcommands/command_invite_people.go index c11f1d7f8e..b005b8509f 100644 --- a/app/slashcommands/command_invite_people.go +++ b/app/slashcommands/command_invite_people.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/mattermost/mattermost-server/v5/app" - "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" ) type InvitePeopleProvider struct { diff --git a/app/slashcommands/command_loadtest.go b/app/slashcommands/command_loadtest.go index f645aa0140..0b7b1a8935 100644 --- a/app/slashcommands/command_loadtest.go +++ b/app/slashcommands/command_loadtest.go @@ -15,9 +15,9 @@ import ( "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v5/app" - "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/utils" ) diff --git a/app/slashcommands/command_msg.go b/app/slashcommands/command_msg.go index 2e63e5d295..046db8de05 100644 --- a/app/slashcommands/command_msg.go +++ b/app/slashcommands/command_msg.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/mattermost/mattermost-server/v5/app" - "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" ) diff --git a/app/slashcommands/command_remove.go b/app/slashcommands/command_remove.go index e786287671..a0d714b026 100644 --- a/app/slashcommands/command_remove.go +++ b/app/slashcommands/command_remove.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/mattermost/mattermost-server/v5/app" - "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" ) type RemoveProvider struct { diff --git a/app/slashcommands/helper_test.go b/app/slashcommands/helper_test.go index 8dcecb4f1e..58d86bbc1b 100644 --- a/app/slashcommands/helper_test.go +++ b/app/slashcommands/helper_test.go @@ -15,8 +15,8 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/config" - "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" "github.com/mattermost/mattermost-server/v5/store/localcachelayer" "github.com/mattermost/mattermost-server/v5/utils" diff --git a/app/slashcommands/main_test.go b/app/slashcommands/main_test.go index 03aa15ac40..d030366fdc 100644 --- a/app/slashcommands/main_test.go +++ b/app/slashcommands/main_test.go @@ -6,7 +6,7 @@ package slashcommands import ( "testing" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/testlib" ) diff --git a/app/status.go b/app/status.go index fa8e684a32..cfe0b8ac12 100644 --- a/app/status.go +++ b/app/status.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "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" ) diff --git a/app/syncables.go b/app/syncables.go index 8ffe737516..e3090930e3 100644 --- a/app/syncables.go +++ b/app/syncables.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // createDefaultChannelMemberships adds users to channels based on their group memberships and how those groups are diff --git a/app/team.go b/app/team.go index dff2e00163..226ecb29a2 100644 --- a/app/team.go +++ b/app/team.go @@ -18,10 +18,10 @@ import ( "github.com/disintegration/imaging" - "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/shared/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/app/upload.go b/app/upload.go index 91a6775fa4..65e08a746c 100644 --- a/app/upload.go +++ b/app/upload.go @@ -12,10 +12,10 @@ import ( "sync" "time" - "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/docextractor" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/app/user.go b/app/user.go index d463716a67..6f68558ae1 100644 --- a/app/user.go +++ b/app/user.go @@ -30,11 +30,11 @@ import ( "github.com/golang/freetype/truetype" "github.com/mattermost/mattermost-server/v5/einterfaces" - "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/shared/i18n" "github.com/mattermost/mattermost-server/v5/shared/mfa" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) diff --git a/app/web_conn.go b/app/web_conn.go index 58fde26773..607ffd74fb 100644 --- a/app/web_conn.go +++ b/app/web_conn.go @@ -20,9 +20,9 @@ import ( "github.com/mailru/easygo/netpoll" "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/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/app/web_hub.go b/app/web_hub.go index 1dff393345..0ea9cfbee5 100644 --- a/app/web_hub.go +++ b/app/web_hub.go @@ -10,8 +10,8 @@ import ( "strconv" "sync/atomic" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/app/webhook.go b/app/webhook.go index b06eae65a8..28a60438cf 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -12,8 +12,8 @@ import ( "strings" "unicode/utf8" - "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" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/app/websocket_router.go b/app/websocket_router.go index 1fb1b7ff4a..e599ee782a 100644 --- a/app/websocket_router.go +++ b/app/websocket_router.go @@ -6,9 +6,9 @@ package app import ( "net/http" - "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" ) type webSocketHandler interface { diff --git a/audit/audit.go b/audit/audit.go index 90a4b31860..2d48e06eb7 100644 --- a/audit/audit.go +++ b/audit/audit.go @@ -10,7 +10,7 @@ import ( "github.com/mattermost/logr" "github.com/mattermost/logr/format" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type Audit struct { diff --git a/cmd/mattermost/commands/config.go b/cmd/mattermost/commands/config.go index 6458036ec2..99c4e97271 100644 --- a/cmd/mattermost/commands/config.go +++ b/cmd/mattermost/commands/config.go @@ -15,9 +15,9 @@ import ( "github.com/spf13/cobra" "github.com/mattermost/mattermost-server/v5/config" - "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/utils" ) diff --git a/cmd/mattermost/commands/jobserver.go b/cmd/mattermost/commands/jobserver.go index 1949ec63b2..26895c10ae 100644 --- a/cmd/mattermost/commands/jobserver.go +++ b/cmd/mattermost/commands/jobserver.go @@ -12,7 +12,7 @@ import ( "github.com/mattermost/mattermost-server/v5/audit" "github.com/mattermost/mattermost-server/v5/config" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) var JobserverCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/logs.go b/cmd/mattermost/commands/logs.go index 0342299456..d19d3a6735 100644 --- a/cmd/mattermost/commands/logs.go +++ b/cmd/mattermost/commands/logs.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/mlog/human" + "github.com/mattermost/mattermost-server/v5/shared/mlog/human" ) var LogsCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/main_test.go b/cmd/mattermost/commands/main_test.go index 3fae93f049..78545fbf09 100644 --- a/cmd/mattermost/commands/main_test.go +++ b/cmd/mattermost/commands/main_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/mattermost/mattermost-server/v5/api4" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/testlib" ) diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index a4e8cb8c5d..2c05bb5f83 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -19,7 +19,7 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/config" "github.com/mattermost/mattermost-server/v5/manualtesting" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v5/web" "github.com/mattermost/mattermost-server/v5/wsapi" diff --git a/cmd/mattermost/commands/utils.go b/cmd/mattermost/commands/utils.go index 9244a824d1..8493b1e95d 100644 --- a/cmd/mattermost/commands/utils.go +++ b/cmd/mattermost/commands/utils.go @@ -14,8 +14,8 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const CustomDefaultsEnvVar = "MM_CUSTOM_DEFAULTS_PATH" diff --git a/config/database.go b/config/database.go index 5cb24fa57a..6abfed7a15 100644 --- a/config/database.go +++ b/config/database.go @@ -17,8 +17,8 @@ import ( // Load the Postgres driver _ "github.com/lib/pq" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // MaxWriteLength defines the maximum length accepted for write to the Configurations or diff --git a/config/emitter.go b/config/emitter.go index d27cacf852..cd457a6bbf 100644 --- a/config/emitter.go +++ b/config/emitter.go @@ -6,8 +6,8 @@ package config import ( "sync" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // emitter enables threadsafe registration and broadcasting to configuration listeners diff --git a/config/emitter_test.go b/config/emitter_test.go index 2efa8cd715..3824a1f3a4 100644 --- a/config/emitter_test.go +++ b/config/emitter_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func TestEmitter(t *testing.T) { diff --git a/config/feature_flags.go b/config/feature_flags.go index 914d078b07..f87d01ee84 100644 --- a/config/feature_flags.go +++ b/config/feature_flags.go @@ -13,8 +13,8 @@ import ( "github.com/splitio/go-client/v6/splitio/client" "github.com/splitio/go-client/v6/splitio/conf" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type FeatureFlagSyncParams struct { diff --git a/config/file.go b/config/file.go index eb5dcda0c4..ce90bdc99e 100644 --- a/config/file.go +++ b/config/file.go @@ -11,8 +11,8 @@ import ( "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/utils/fileutils" ) diff --git a/config/logging.go b/config/logging.go index 53c960c3e0..367ff95b29 100644 --- a/config/logging.go +++ b/config/logging.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type LogSrcListener func(old, new mlog.LogTargetCfg) diff --git a/config/main_test.go b/config/main_test.go index 6719b59ee5..40a952712e 100644 --- a/config/main_test.go +++ b/config/main_test.go @@ -11,8 +11,8 @@ import ( "github.com/lib/pq" "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/shared/mlog" "github.com/mattermost/mattermost-server/v5/testlib" ) diff --git a/config/split_logger.go b/config/split_logger.go index 10f9d81de5..1025f4ba05 100644 --- a/config/split_logger.go +++ b/config/split_logger.go @@ -6,7 +6,7 @@ package config import ( "fmt" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type splitLogger struct { diff --git a/config/utils.go b/config/utils.go index b28e56308d..dd5cb50f2d 100644 --- a/config/utils.go +++ b/config/utils.go @@ -8,9 +8,9 @@ import ( "reflect" "strings" - "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/utils" ) diff --git a/config/watcher.go b/config/watcher.go index 2f678f5996..a7728e9bc2 100644 --- a/config/watcher.go +++ b/config/watcher.go @@ -9,7 +9,7 @@ import ( "github.com/fsnotify/fsnotify" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // watcher monitors a file for changes diff --git a/jobs/active_users/worker.go b/jobs/active_users/worker.go index 6209f2f88b..72d318d3d1 100644 --- a/jobs/active_users/worker.go +++ b/jobs/active_users/worker.go @@ -9,8 +9,8 @@ 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/shared/mlog" ) const ( diff --git a/jobs/expirynotify/worker.go b/jobs/expirynotify/worker.go index 7498371b7c..64088d885e 100644 --- a/jobs/expirynotify/worker.go +++ b/jobs/expirynotify/worker.go @@ -6,8 +6,8 @@ package expirynotify import ( "github.com/mattermost/mattermost-server/v5/app" "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 ( diff --git a/jobs/export_delete/worker.go b/jobs/export_delete/worker.go index 1e25fa1d04..78834ddba6 100644 --- a/jobs/export_delete/worker.go +++ b/jobs/export_delete/worker.go @@ -10,8 +10,8 @@ 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/shared/mlog" ) func init() { diff --git a/jobs/export_process/worker.go b/jobs/export_process/worker.go index 9aca933bf9..f1f8158817 100644 --- a/jobs/export_process/worker.go +++ b/jobs/export_process/worker.go @@ -10,8 +10,8 @@ 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/shared/mlog" ) func init() { diff --git a/jobs/import_delete/worker.go b/jobs/import_delete/worker.go index acee27ec39..e50e225507 100644 --- a/jobs/import_delete/worker.go +++ b/jobs/import_delete/worker.go @@ -11,8 +11,8 @@ 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/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/jobs/import_process/worker.go b/jobs/import_process/worker.go index 6ddf011bd5..942e936671 100644 --- a/jobs/import_process/worker.go +++ b/jobs/import_process/worker.go @@ -15,8 +15,8 @@ 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/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/jobs/jobs.go b/jobs/jobs.go index 3ec225f3ee..690ed884a8 100644 --- a/jobs/jobs.go +++ b/jobs/jobs.go @@ -9,8 +9,8 @@ import ( "net/http" "time" - "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" ) diff --git a/jobs/jobs_watcher.go b/jobs/jobs_watcher.go index b146728ee4..e5237c8800 100644 --- a/jobs/jobs_watcher.go +++ b/jobs/jobs_watcher.go @@ -7,8 +7,8 @@ import ( "math/rand" "time" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // Default polling interval for jobs termination. diff --git a/jobs/product_notices/worker.go b/jobs/product_notices/worker.go index 07dd110cf1..8f0a794776 100644 --- a/jobs/product_notices/worker.go +++ b/jobs/product_notices/worker.go @@ -6,8 +6,8 @@ package product_notices import ( "github.com/mattermost/mattermost-server/v5/app" "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 ( diff --git a/jobs/schedulers.go b/jobs/schedulers.go index 2583a28e58..243937c225 100644 --- a/jobs/schedulers.go +++ b/jobs/schedulers.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type Schedulers struct { diff --git a/jobs/workers.go b/jobs/workers.go index b67e11d25e..a68ef15c73 100644 --- a/jobs/workers.go +++ b/jobs/workers.go @@ -6,9 +6,9 @@ package jobs import ( "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/shared/mlog" ) type Workers struct { diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go index 12e42ced49..9b5bc5f009 100644 --- a/manualtesting/manual_testing.go +++ b/manualtesting/manual_testing.go @@ -15,8 +15,8 @@ import ( "github.com/mattermost/mattermost-server/v5/api4" "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/app/slashcommands" - "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" "github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/mattermost-server/v5/web" diff --git a/manualtesting/test_autolink.go b/manualtesting/test_autolink.go index df218aa2cc..d049468e8a 100644 --- a/manualtesting/test_autolink.go +++ b/manualtesting/test_autolink.go @@ -6,8 +6,8 @@ package manualtesting import ( "net/http" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const linkPostText = ` diff --git a/migrations/main_test.go b/migrations/main_test.go index cffca24439..7b89d92d92 100644 --- a/migrations/main_test.go +++ b/migrations/main_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/testlib" ) diff --git a/migrations/scheduler.go b/migrations/scheduler.go index 829a6ed1b4..ed01dbbc32 100644 --- a/migrations/scheduler.go +++ b/migrations/scheduler.go @@ -7,8 +7,8 @@ import ( "time" "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/migrations/worker.go b/migrations/worker.go index 2c6130a046..0ff648fb4a 100644 --- a/migrations/worker.go +++ b/migrations/worker.go @@ -10,8 +10,8 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "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 ( diff --git a/model/bundle_info.go b/model/bundle_info.go index 5954432e0a..e4cfe12563 100644 --- a/model/bundle_info.go +++ b/model/bundle_info.go @@ -4,7 +4,7 @@ package model import ( - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type BundleInfo struct { diff --git a/model/config.go b/model/config.go index 77e06bcc87..1424ed59bd 100644 --- a/model/config.go +++ b/model/config.go @@ -19,9 +19,8 @@ import ( "time" "github.com/mattermost/ldap" - - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/shared/filestore" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/model/file_info.go b/model/file_info.go index 0c34731c63..ca3319a491 100644 --- a/model/file_info.go +++ b/model/file_info.go @@ -17,7 +17,7 @@ import ( "github.com/disintegration/imaging" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/model/session.go b/model/session.go index d56daf2169..9b0bd628ed 100644 --- a/model/session.go +++ b/model/session.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/plugin/client_rpc.go b/plugin/client_rpc.go index 87871eb075..8382fe005e 100644 --- a/plugin/client_rpc.go +++ b/plugin/client_rpc.go @@ -21,8 +21,8 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" "github.com/hashicorp/go-plugin" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) var hookNameToId map[string]int = make(map[string]int) diff --git a/plugin/client_rpc_generated.go b/plugin/client_rpc_generated.go index 9de25cd0c5..a89a122563 100644 --- a/plugin/client_rpc_generated.go +++ b/plugin/client_rpc_generated.go @@ -10,8 +10,8 @@ import ( "fmt" "log" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func init() { diff --git a/plugin/environment.go b/plugin/environment.go index c69be7f074..6d44047dde 100644 --- a/plugin/environment.go +++ b/plugin/environment.go @@ -15,8 +15,8 @@ import ( "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v5/einterfaces" - "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/utils" ) diff --git a/plugin/hclog_adapter.go b/plugin/hclog_adapter.go index e79cee2316..09826988d2 100644 --- a/plugin/hclog_adapter.go +++ b/plugin/hclog_adapter.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-hclog" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type hclogAdapter struct { diff --git a/plugin/health_check.go b/plugin/health_check.go index 36b4ab8fd1..69beb23a2d 100644 --- a/plugin/health_check.go +++ b/plugin/health_check.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/plugin/health_check_test.go b/plugin/health_check_test.go index 82335b0417..3659ba2d17 100644 --- a/plugin/health_check_test.go +++ b/plugin/health_check_test.go @@ -12,8 +12,8 @@ import ( "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/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/plugin/http.go b/plugin/http.go index b54f376fd7..65c17749b9 100644 --- a/plugin/http.go +++ b/plugin/http.go @@ -12,7 +12,7 @@ import ( "net/http" "net/rpc" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type hijackedResponse struct { diff --git a/plugin/scheduler/scheduler.go b/plugin/scheduler/scheduler.go index 72919bb15e..f9f97754e6 100644 --- a/plugin/scheduler/scheduler.go +++ b/plugin/scheduler/scheduler.go @@ -7,8 +7,8 @@ import ( "time" "github.com/mattermost/mattermost-server/v5/app" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const pluginsJobInterval = 24 * 60 * 60 * time.Second diff --git a/plugin/scheduler/worker.go b/plugin/scheduler/worker.go index 6ace11be77..68bbe497ab 100644 --- a/plugin/scheduler/worker.go +++ b/plugin/scheduler/worker.go @@ -6,8 +6,8 @@ package scheduler import ( "github.com/mattermost/mattermost-server/v5/app" "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" ) type Worker struct { diff --git a/plugin/supervisor.go b/plugin/supervisor.go index 3264e2b8d6..ce067aff39 100644 --- a/plugin/supervisor.go +++ b/plugin/supervisor.go @@ -15,8 +15,8 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type supervisor struct { diff --git a/plugin/supervisor_test.go b/plugin/supervisor_test.go index d0a18a4d69..0f2bdef9fa 100644 --- a/plugin/supervisor_test.go +++ b/plugin/supervisor_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "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/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/services/awsmeter/awsmeter.go b/services/awsmeter/awsmeter.go index 20f7685bd8..ebf5841790 100644 --- a/services/awsmeter/awsmeter.go +++ b/services/awsmeter/awsmeter.go @@ -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" ) diff --git a/services/docextractor/combine.go b/services/docextractor/combine.go index 5de5249f24..4c230f2cac 100644 --- a/services/docextractor/combine.go +++ b/services/docextractor/combine.go @@ -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 { diff --git a/services/imageproxy/imageproxy.go b/services/imageproxy/imageproxy.go index 32eaeb131c..98313b7482 100644 --- a/services/imageproxy/imageproxy.go +++ b/services/imageproxy/imageproxy.go @@ -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")} diff --git a/services/imageproxy/local.go b/services/imageproxy/local.go index 144bf8428b..98216326db 100644 --- a/services/imageproxy/local.go +++ b/services/imageproxy/local.go @@ -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{ diff --git a/services/mailservice/mail.go b/services/mailservice/mail.go index ba72103585..9d8344126c 100644 --- a/services/mailservice/mail.go +++ b/services/mailservice/mail.go @@ -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 ( diff --git a/services/searchengine/bleveengine/bleve.go b/services/searchengine/bleveengine/bleve.go index 27eb7ed2aa..a4ca106cc1 100644 --- a/services/searchengine/bleveengine/bleve.go +++ b/services/searchengine/bleveengine/bleve.go @@ -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 ( diff --git a/services/searchengine/bleveengine/indexer/indexing_job.go b/services/searchengine/bleveengine/indexer/indexing_job.go index f2eaca87da..29bd090579 100644 --- a/services/searchengine/bleveengine/indexer/indexing_job.go +++ b/services/searchengine/bleveengine/indexer/indexing_job.go @@ -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 ( diff --git a/services/searchengine/bleveengine/search.go b/services/searchengine/bleveengine/search.go index 190f5c9e91..d9cf3c44af 100644 --- a/services/searchengine/bleveengine/search.go +++ b/services/searchengine/bleveengine/search.go @@ -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 diff --git a/services/slackimport/converters.go b/services/slackimport/converters.go index 09f8838344..0317837ef2 100644 --- a/services/slackimport/converters.go +++ b/services/slackimport/converters.go @@ -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 { diff --git a/services/slackimport/main_test.go b/services/slackimport/main_test.go index 86bf3cba94..4ef93c9419 100644 --- a/services/slackimport/main_test.go +++ b/services/slackimport/main_test.go @@ -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) { diff --git a/services/slackimport/parsers.go b/services/slackimport/parsers.go index a21dd26614..12984d8621 100644 --- a/services/slackimport/parsers.go +++ b/services/slackimport/parsers.go @@ -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) { diff --git a/services/slackimport/slackimport.go b/services/slackimport/slackimport.go index 8c0f2fc8db..50ce3f683e 100644 --- a/services/slackimport/slackimport.go +++ b/services/slackimport/slackimport.go @@ -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" ) diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 049f128848..ce8dfd20a9 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -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" ) diff --git a/services/telemetry/telemetry_test.go b/services/telemetry/telemetry_test.go index dfc990d72d..f13ecf6f92 100644 --- a/services/telemetry/telemetry_test.go +++ b/services/telemetry/telemetry_test.go @@ -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" ) diff --git a/services/tracing/tracing.go b/services/tracing/tracing.go index eac51db319..6b9954a6e4 100644 --- a/services/tracing/tracing.go +++ b/services/tracing/tracing.go @@ -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 diff --git a/services/upgrader/upgrader_linux.go b/services/upgrader/upgrader_linux.go index a76f78c12c..d33bb6d14b 100644 --- a/services/upgrader/upgrader_linux.go +++ b/services/upgrader/upgrader_linux.go @@ -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----- diff --git a/shared/filestore/filesstore_test.go b/shared/filestore/filesstore_test.go index 8b45ea18ea..cdd4fb7f77 100644 --- a/shared/filestore/filesstore_test.go +++ b/shared/filestore/filesstore_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/xtgo/uuid" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func randomString() string { diff --git a/shared/filestore/localstore.go b/shared/filestore/localstore.go index c100e87cb0..6cd8c4ca99 100644 --- a/shared/filestore/localstore.go +++ b/shared/filestore/localstore.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/shared/filestore/s3store.go b/shared/filestore/s3store.go index 4000f808a2..a7a59c7410 100644 --- a/shared/filestore/s3store.go +++ b/shared/filestore/s3store.go @@ -17,7 +17,7 @@ import ( "github.com/minio/minio-go/v7/pkg/encrypt" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // S3FileBackend contains all necessary information to communicate with diff --git a/shared/i18n/i18n.go b/shared/i18n/i18n.go index 7740f52284..a5de30bbf3 100644 --- a/shared/i18n/i18n.go +++ b/shared/i18n/i18n.go @@ -14,7 +14,7 @@ import ( "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const defaultLocale = "en" diff --git a/mlog/default.go b/shared/mlog/default.go similarity index 100% rename from mlog/default.go rename to shared/mlog/default.go diff --git a/mlog/errors.go b/shared/mlog/errors.go similarity index 100% rename from mlog/errors.go rename to shared/mlog/errors.go diff --git a/mlog/global.go b/shared/mlog/global.go similarity index 100% rename from mlog/global.go rename to shared/mlog/global.go diff --git a/mlog/global_test.go b/shared/mlog/global_test.go similarity index 98% rename from mlog/global_test.go rename to shared/mlog/global_test.go index 5abc977914..7da9e62aaa 100644 --- a/mlog/global_test.go +++ b/shared/mlog/global_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func TestLoggingBeforeInitialized(t *testing.T) { diff --git a/mlog/human/entry.go b/shared/mlog/human/entry.go similarity index 94% rename from mlog/human/entry.go rename to shared/mlog/human/entry.go index 5ef52eb4a0..b5c69e9af8 100644 --- a/mlog/human/entry.go +++ b/shared/mlog/human/entry.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type LogEntry struct { diff --git a/mlog/human/logrus_writer.go b/shared/mlog/human/logrus_writer.go similarity index 100% rename from mlog/human/logrus_writer.go rename to shared/mlog/human/logrus_writer.go diff --git a/mlog/human/parser.go b/shared/mlog/human/parser.go similarity index 98% rename from mlog/human/parser.go rename to shared/mlog/human/parser.go index d16b5de68a..7898a77f0d 100644 --- a/mlog/human/parser.go +++ b/shared/mlog/human/parser.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func ParseLogMessage(msg string) LogEntry { diff --git a/mlog/human/process.go b/shared/mlog/human/process.go similarity index 100% rename from mlog/human/process.go rename to shared/mlog/human/process.go diff --git a/mlog/human/simple_writer.go b/shared/mlog/human/simple_writer.go similarity index 100% rename from mlog/human/simple_writer.go rename to shared/mlog/human/simple_writer.go diff --git a/mlog/levels.go b/shared/mlog/levels.go similarity index 100% rename from mlog/levels.go rename to shared/mlog/levels.go diff --git a/mlog/log.go b/shared/mlog/log.go similarity index 100% rename from mlog/log.go rename to shared/mlog/log.go diff --git a/mlog/log_test.go b/shared/mlog/log_test.go similarity index 94% rename from mlog/log_test.go rename to shared/mlog/log_test.go index 491c6fb0ae..4b018285d4 100644 --- a/mlog/log_test.go +++ b/shared/mlog/log_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) // Test race condition when shutting down advanced logging. This test must run with the -race flag in order to verify diff --git a/mlog/logr.go b/shared/mlog/logr.go similarity index 100% rename from mlog/logr.go rename to shared/mlog/logr.go diff --git a/mlog/stdlog.go b/shared/mlog/stdlog.go similarity index 100% rename from mlog/stdlog.go rename to shared/mlog/stdlog.go diff --git a/mlog/stdlog_test.go b/shared/mlog/stdlog_test.go similarity index 100% rename from mlog/stdlog_test.go rename to shared/mlog/stdlog_test.go diff --git a/mlog/sugar.go b/shared/mlog/sugar.go similarity index 100% rename from mlog/sugar.go rename to shared/mlog/sugar.go diff --git a/mlog/syslog.go b/shared/mlog/syslog.go similarity index 100% rename from mlog/syslog.go rename to shared/mlog/syslog.go diff --git a/mlog/syslog_test.go b/shared/mlog/syslog_test.go similarity index 100% rename from mlog/syslog_test.go rename to shared/mlog/syslog_test.go diff --git a/mlog/tcp.go b/shared/mlog/tcp.go similarity index 100% rename from mlog/tcp.go rename to shared/mlog/tcp.go diff --git a/mlog/tcp_test.go b/shared/mlog/tcp_test.go similarity index 100% rename from mlog/tcp_test.go rename to shared/mlog/tcp_test.go diff --git a/mlog/test-tls-client-cert.pem b/shared/mlog/test-tls-client-cert.pem similarity index 100% rename from mlog/test-tls-client-cert.pem rename to shared/mlog/test-tls-client-cert.pem diff --git a/mlog/testing.go b/shared/mlog/testing.go similarity index 100% rename from mlog/testing.go rename to shared/mlog/testing.go diff --git a/store/localcachelayer/main_test.go b/store/localcachelayer/main_test.go index fc842c430b..a4b78a9a22 100644 --- a/store/localcachelayer/main_test.go +++ b/store/localcachelayer/main_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/cache" cachemocks "github.com/mattermost/mattermost-server/v5/services/cache/mocks" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v5/store/sqlstore" "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" diff --git a/store/searchlayer/channel_layer.go b/store/searchlayer/channel_layer.go index fd7a0243da..85130b6f92 100644 --- a/store/searchlayer/channel_layer.go +++ b/store/searchlayer/channel_layer.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/searchengine" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/store/searchlayer/file_info_layer.go b/store/searchlayer/file_info_layer.go index e281b1e573..6b18fb193a 100644 --- a/store/searchlayer/file_info_layer.go +++ b/store/searchlayer/file_info_layer.go @@ -4,9 +4,9 @@ package searchlayer import ( - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/searchengine" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/store/searchlayer/layer.go b/store/searchlayer/layer.go index dfeec4fe69..dc6fd9f0a4 100644 --- a/store/searchlayer/layer.go +++ b/store/searchlayer/layer.go @@ -7,9 +7,9 @@ import ( "context" "sync/atomic" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/searchengine" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/store/searchlayer/post_layer.go b/store/searchlayer/post_layer.go index 57311cd1f2..6f4d4dea75 100644 --- a/store/searchlayer/post_layer.go +++ b/store/searchlayer/post_layer.go @@ -6,9 +6,9 @@ package searchlayer import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/searchengine" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/store/searchlayer/user_layer.go b/store/searchlayer/user_layer.go index 126032edb4..d98e124b47 100644 --- a/store/searchlayer/user_layer.go +++ b/store/searchlayer/user_layer.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/searchengine" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/store/sqlstore/channel_member_history_store.go b/store/sqlstore/channel_member_history_store.go index 44f7bf45d9..556d266a27 100644 --- a/store/sqlstore/channel_member_history_store.go +++ b/store/sqlstore/channel_member_history_store.go @@ -10,8 +10,8 @@ import ( sq "github.com/Masterminds/squirrel" "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" ) diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index a184517d56..de845cf77e 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -16,9 +16,9 @@ import ( "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v5/einterfaces" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/cache" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store" ) diff --git a/store/sqlstore/command_webhook_store.go b/store/sqlstore/command_webhook_store.go index 7d2a82f516..18d7ff17db 100644 --- a/store/sqlstore/command_webhook_store.go +++ b/store/sqlstore/command_webhook_store.go @@ -9,8 +9,8 @@ import ( sq "github.com/Masterminds/squirrel" "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" ) diff --git a/store/sqlstore/file_info_store.go b/store/sqlstore/file_info_store.go index 5e676d94fd..916d3b668a 100644 --- a/store/sqlstore/file_info_store.go +++ b/store/sqlstore/file_info_store.go @@ -14,8 +14,8 @@ import ( "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v5/einterfaces" - "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" ) diff --git a/store/sqlstore/integrity.go b/store/sqlstore/integrity.go index e2235b99b9..26904c0940 100644 --- a/store/sqlstore/integrity.go +++ b/store/sqlstore/integrity.go @@ -6,8 +6,8 @@ package sqlstore import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) type relationalCheckConfig struct { diff --git a/store/sqlstore/main_test.go b/store/sqlstore/main_test.go index e7f8cca2c4..7ff1f15735 100644 --- a/store/sqlstore/main_test.go +++ b/store/sqlstore/main_test.go @@ -6,7 +6,7 @@ package sqlstore_test import ( "testing" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store/sqlstore" "github.com/mattermost/mattermost-server/v5/testlib" ) diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index b164498957..a065c0ce03 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -17,8 +17,8 @@ import ( "github.com/pkg/errors" "github.com/mattermost/mattermost-server/v5/einterfaces" - "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" "github.com/mattermost/mattermost-server/v5/store/searchlayer" "github.com/mattermost/mattermost-server/v5/utils" diff --git a/store/sqlstore/preference_store.go b/store/sqlstore/preference_store.go index daec8adf8e..1b3de523cb 100644 --- a/store/sqlstore/preference_store.go +++ b/store/sqlstore/preference_store.go @@ -9,8 +9,8 @@ import ( "github.com/mattermost/gorp" "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" ) diff --git a/store/sqlstore/reaction_store.go b/store/sqlstore/reaction_store.go index 23b0f48d95..0acf2979aa 100644 --- a/store/sqlstore/reaction_store.go +++ b/store/sqlstore/reaction_store.go @@ -4,8 +4,8 @@ package sqlstore import ( - "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" "github.com/mattermost/gorp" diff --git a/store/sqlstore/session_store.go b/store/sqlstore/session_store.go index 7923bb3d35..6d01d91067 100644 --- a/store/sqlstore/session_store.go +++ b/store/sqlstore/session_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/Masterminds/squirrel" "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" ) diff --git a/store/sqlstore/store.go b/store/sqlstore/store.go index d801756115..1566a8880e 100644 --- a/store/sqlstore/store.go +++ b/store/sqlstore/store.go @@ -33,9 +33,9 @@ import ( "github.com/mattermost/mattermost-server/v5/db/migrations" "github.com/mattermost/mattermost-server/v5/einterfaces" - "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" ) diff --git a/store/sqlstore/tokens_store.go b/store/sqlstore/tokens_store.go index 00e81a1855..80c40873c1 100644 --- a/store/sqlstore/tokens_store.go +++ b/store/sqlstore/tokens_store.go @@ -9,8 +9,8 @@ import ( "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" ) diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index ce72d7451b..e7c4c13c90 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -13,9 +13,9 @@ import ( "github.com/blang/semver" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/timezones" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) const ( diff --git a/store/sqlstore/utils.go b/store/sqlstore/utils.go index a02f61661d..1716cdd8a5 100644 --- a/store/sqlstore/utils.go +++ b/store/sqlstore/utils.go @@ -11,7 +11,7 @@ import ( "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) var escapeLikeSearchChar = []string{ diff --git a/testlib/helper.go b/testlib/helper.go index d9d173da21..0a0ab03fad 100644 --- a/testlib/helper.go +++ b/testlib/helper.go @@ -14,9 +14,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "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/store/searchlayer" "github.com/mattermost/mattermost-server/v5/store/sqlstore" diff --git a/utils/html.go b/utils/html.go index 23ecbe45ab..17ba46b7b2 100644 --- a/utils/html.go +++ b/utils/html.go @@ -13,7 +13,7 @@ import ( "github.com/fsnotify/fsnotify" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) diff --git a/utils/license.go b/utils/license.go index b7995a4f52..3b851f8d1b 100644 --- a/utils/license.go +++ b/utils/license.go @@ -16,8 +16,8 @@ import ( "strconv" "strings" - "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/utils/fileutils" ) diff --git a/utils/logger.go b/utils/logger.go index 49a63936c4..ea42ebb043 100644 --- a/utils/logger.go +++ b/utils/logger.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "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/utils/fileutils" ) diff --git a/utils/subpath.go b/utils/subpath.go index fa9d84fc2e..35461a576e 100644 --- a/utils/subpath.go +++ b/utils/subpath.go @@ -17,8 +17,8 @@ import ( "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/utils/fileutils" ) diff --git a/web/context.go b/web/context.go index c3b7b79f63..a7f9692d10 100644 --- a/web/context.go +++ b/web/context.go @@ -11,9 +11,9 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/audit" - "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/utils" ) diff --git a/web/handlers.go b/web/handlers.go index 946746feb9..0f5a4d17d4 100644 --- a/web/handlers.go +++ b/web/handlers.go @@ -21,10 +21,10 @@ import ( "github.com/mattermost/mattermost-server/v5/app" app_opentracing "github.com/mattermost/mattermost-server/v5/app/opentracing" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/services/tracing" "github.com/mattermost/mattermost-server/v5/shared/i18n" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/store/opentracinglayer" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/web/main_test.go b/web/main_test.go index fc08f7a5bd..5c245c9c5a 100644 --- a/web/main_test.go +++ b/web/main_test.go @@ -6,7 +6,7 @@ package web import ( "testing" - "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/shared/mlog" "github.com/mattermost/mattermost-server/v5/testlib" ) diff --git a/web/oauth.go b/web/oauth.go index 4dfc0cf340..c15407b970 100644 --- a/web/oauth.go +++ b/web/oauth.go @@ -11,9 +11,9 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/audit" - "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/utils" "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) diff --git a/web/oauth_test.go b/web/oauth_test.go index 2b2aa88078..325c6a0396 100644 --- a/web/oauth_test.go +++ b/web/oauth_test.go @@ -18,9 +18,9 @@ import ( "github.com/stretchr/testify/require" "github.com/mattermost/mattermost-server/v5/einterfaces" - "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/utils" ) diff --git a/web/saml.go b/web/saml.go index eb52a0a346..d9e9a14eee 100644 --- a/web/saml.go +++ b/web/saml.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/mattermost/mattermost-server/v5/audit" - "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/utils" ) diff --git a/web/static.go b/web/static.go index 5bf082035e..7cf725c3c6 100644 --- a/web/static.go +++ b/web/static.go @@ -11,8 +11,8 @@ import ( "github.com/NYTimes/gziphandler" - "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/utils" "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) diff --git a/web/web.go b/web/web.go index fd788b2c13..8e1048b71d 100644 --- a/web/web.go +++ b/web/web.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/mux" "github.com/mattermost/mattermost-server/v5/app" - "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/shared/mlog" "github.com/mattermost/mattermost-server/v5/utils" ) diff --git a/web/web_test.go b/web/web_test.go index d22fa36fd3..5a73ede884 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -18,9 +18,9 @@ import ( "github.com/mattermost/mattermost-server/v5/app" "github.com/mattermost/mattermost-server/v5/config" - "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/shared/mlog" "github.com/mattermost/mattermost-server/v5/store/localcachelayer" "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" "github.com/mattermost/mattermost-server/v5/utils" diff --git a/web/webhook.go b/web/webhook.go index bc24ac60b7..068cf423c2 100644 --- a/web/webhook.go +++ b/web/webhook.go @@ -12,8 +12,8 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/schema" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func (w *Web) InitWebhooks() { diff --git a/wsapi/status.go b/wsapi/status.go index 7ca32e28a1..a5abd6f3d3 100644 --- a/wsapi/status.go +++ b/wsapi/status.go @@ -4,8 +4,8 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/shared/mlog" ) func (api *API) InitStatus() { diff --git a/wsapi/websocket_handler.go b/wsapi/websocket_handler.go index 3aff1589a7..0707add5fa 100644 --- a/wsapi/websocket_handler.go +++ b/wsapi/websocket_handler.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/mattermost/mattermost-server/v5/app" - "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" ) func (api *API) ApiWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)) webSocketHandler {