Skip to content

Commit

Permalink
update migrations settings
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeyxo committed Mar 4, 2025
1 parent a30fb77 commit 0689b8a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 15 deletions.
2 changes: 1 addition & 1 deletion gen/settings/Settings.pkl.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion gen/settings/migrations/Config.pkl.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions internal/migrator/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
)

type Migrator struct {
logger *zerolog.Logger
cfg migrations.Config
migrations map[driver.Driver]MigrationInterface
logger *zerolog.Logger
mList []migrations.Migration
mByDriver map[driver.Driver]MigrationInterface
}

func NewMigrator(
Expand All @@ -26,7 +26,7 @@ func NewMigrator(
}
c := cfg.Settings.Migrations
migrators := map[driver.Driver]MigrationInterface{}
for _, m := range *c.Migrations {
for _, m := range *c {
switch m.GetDriver() {
case driver.Clickhouse:
c, ok := m.(migrations.Clickhouse)
Expand All @@ -35,20 +35,20 @@ func NewMigrator(
}
migrators[m.GetDriver()] = NewMigrateClick(c)
case driver.Empty:
return nil, fmt.Errorf("empty migrations not supported")
return nil, fmt.Errorf("empty mByDriver not supported")
}
}
return &Migrator{
cfg: *c,
migrations: migrators,
logger: l,
mList: *c,
mByDriver: migrators,
logger: l,
}, nil
}
func (m *Migrator) Migrate() error {
gr := errgroup.Group{}
for _, mgr := range *m.cfg.Migrations {
for _, mgr := range m.mList {
m.logger.Info().Msgf("Starting migration: %s", mgr.GetDriver())
migrator := m.migrations[mgr.GetDriver()]
migrator := m.mByDriver[mgr.GetDriver()]
gr.Go(func() error {
err := migrator.Run(mgr.GetPath())
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkl/settings/Settings.pkl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ import "migrations/MigrationsConfig.pkl"
logger: LoggerConfig
healthCheck: HealthcheckConfig?
metrics: MetricsConfig?
migrations:MigrationsConfig?
migrations:Listing<MigrationsConfig.Migration>?
startGCAfterMessageProcess: Boolean = false
gracefulShutdownDelay:Duration = 15.s
2 changes: 0 additions & 2 deletions pkl/settings/migrations/MigrationsConfig.pkl
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ class Clickhouse extends Migration {
credentials: Common.ChCredentials
engine: String?
}

migrations: Listing<Migration>?

0 comments on commit 0689b8a

Please sign in to comment.