mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

[MM-55595] Use annotated logger in search layer (#25468)

Просмотр исходного кода
Этот коммит содержится в:
Ben Schumacher
2023-12-04 18:34:57 +01:00
коммит произвёл GitHub
родитель 5a4dba8809
Коммит b2ec1ff8ae
130 изменённых файлов: 2107 добавлений и 1930 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
server/cmd/mattermost/commands/db.go
Просмотреть файл

@@ -14,6 +14,7 @@ import (
"github.com/spf13/cobra"
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/v8/channels/store/sqlstore"
"github.com/mattermost/mattermost/server/v8/config"
"github.com/mattermost/mattermost/server/v8/platform/shared/filestore"
@@ -97,6 +98,8 @@ func init() {
}
func initDbCmdF(command *cobra.Command, _ []string) error {
logger := mlog.CreateConsoleLogger()
dsn := getConfigDSN(command, config.GetEnvironment())
if !config.IsDatabaseDSN(dsn) {
return errors.New("this command should be run using a database configuration DSN")
@@ -113,7 +116,7 @@ func initDbCmdF(command *cobra.Command, _ []string) error {
}
defer configStore.Close()
sqlStore, err := sqlstore.New(configStore.Get().SqlSettings, nil)
sqlStore, err := sqlstore.New(configStore.Get().SqlSettings, logger, nil)
if err != nil {
return errors.Wrap(err, "failed to initialize store")
}
@@ -125,7 +128,9 @@ func initDbCmdF(command *cobra.Command, _ []string) error {
}
func resetCmdF(command *cobra.Command, args []string) error {
ss, err := initStoreCommandContextCobra(command)
logger := mlog.CreateConsoleLogger()
ss, err := initStoreCommandContextCobra(logger, command)
if err != nil {
return errors.Wrap(err, "could not initialize store")
}
@@ -155,6 +160,9 @@ func resetCmdF(command *cobra.Command, args []string) error {
}
func migrateCmdF(command *cobra.Command, args []string) error {
logger := mlog.CreateConsoleLogger()
defer logger.Shutdown()
cfgDSN := getConfigDSN(command, config.GetEnvironment())
recoverFlag, _ := command.Flags().GetBool("auto-recover")
savePlan, _ := command.Flags().GetBool("save-plan")
@@ -165,7 +173,7 @@ func migrateCmdF(command *cobra.Command, args []string) error {
}
config := cfgStore.Get()
migrator, err := sqlstore.NewMigrator(config.SqlSettings, dryRun)
migrator, err := sqlstore.NewMigrator(config.SqlSettings, logger, dryRun)
if err != nil {
return errors.Wrap(err, "failed to create migrator")
}
@@ -219,6 +227,9 @@ func migrateCmdF(command *cobra.Command, args []string) error {
}
func downgradeCmdF(command *cobra.Command, args []string) error {
logger := mlog.CreateConsoleLogger()
defer logger.Shutdown()
cfgDSN := getConfigDSN(command, config.GetEnvironment())
cfgStore, err := config.NewStoreFromDSN(cfgDSN, true, nil, true)
if err != nil {
@@ -234,7 +245,7 @@ func downgradeCmdF(command *cobra.Command, args []string) error {
return fmt.Errorf("failed to initialize filebackend: %w", err2)
}
migrator, err := sqlstore.NewMigrator(config.SqlSettings, dryRun)
migrator, err := sqlstore.NewMigrator(config.SqlSettings, logger, dryRun)
if err != nil {
return errors.Wrap(err, "failed to create migrator")
}
@@ -280,7 +291,10 @@ func downgradeCmdF(command *cobra.Command, args []string) error {
}
func dbVersionCmdF(command *cobra.Command, args []string) error {
ss, err := initStoreCommandContextCobra(command)
logger := mlog.CreateConsoleLogger()
defer logger.Shutdown()
ss, err := initStoreCommandContextCobra(logger, command)
if err != nil {
return errors.Wrap(err, "could not initialize store")
}

5
server/cmd/mattermost/commands/init.go
Просмотреть файл

@@ -9,6 +9,7 @@ import (
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/i18n"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/public/shared/request"
"github.com/mattermost/mattermost/server/v8/channels/app"
"github.com/mattermost/mattermost/server/v8/channels/store"
@@ -56,7 +57,7 @@ func initDBCommandContext(configDSN string, readOnlyConfigStore bool, options ..
return a, nil
}
func initStoreCommandContextCobra(command *cobra.Command) (store.Store, error) {
func initStoreCommandContextCobra(logger mlog.LoggerIFace, command *cobra.Command) (store.Store, error) {
cfgDSN := getConfigDSN(command, config.GetEnvironment())
cfgStore, err := config.NewStoreFromDSN(cfgDSN, true, nil, true)
if err != nil {
@@ -64,5 +65,5 @@ func initStoreCommandContextCobra(command *cobra.Command) (store.Store, error) {
}
config := cfgStore.Get()
return sqlstore.New(config.SqlSettings, nil)
return sqlstore.New(config.SqlSettings, logger, nil)
}

7
server/cmd/mattermost/commands/jobserver.go
Просмотреть файл

@@ -10,7 +10,6 @@ import (
"github.com/spf13/cobra"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/public/shared/request"
"github.com/mattermost/mattermost/server/v8/channels/app"
"github.com/mattermost/mattermost/server/v8/channels/audit"
@@ -47,8 +46,8 @@ func jobserverCmdF(command *cobra.Command, args []string) error {
rctx := request.EmptyContext(a.Log())
// Run jobs
mlog.Info("Starting Mattermost job server")
defer mlog.Info("Stopped Mattermost job server")
a.Log().Info("Starting Mattermost job server")
defer a.Log().Info("Stopped Mattermost job server")
if !noJobs {
a.Srv().Jobs.StartWorkers()
@@ -69,7 +68,7 @@ func jobserverCmdF(command *cobra.Command, args []string) error {
<-signalChan
// Cleanup anything that isn't handled by a defer statement
mlog.Info("Stopping Mattermost job server")
a.Log().Info("Stopping Mattermost job server")
return nil
}