Skip to content

Commit

Permalink
Test fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sesposito committed May 23, 2024
1 parent 9ab405e commit fcefdc4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
10 changes: 9 additions & 1 deletion migrate/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ import (
"github.com/heroiclabs/nakama/v3/server"
sqlmigrate "github.com/heroiclabs/sql-migrate"
"github.com/jackc/pgx/v5"
_ "github.com/jackc/pgx/v5/stdlib" // Blank import to register SQL driver
"go.uber.org/zap"
"go.uber.org/zap/zapcore"

_ "github.com/jackc/pgx/v5/stdlib" // Blank import to register SQL driver
)

const (
Expand Down Expand Up @@ -62,6 +63,7 @@ func Check(ctx context.Context, logger *zap.Logger, db *pgx.Conn) {
if err != nil {
logger.Fatal("Could not find migrations", zap.Error(err))
}

records, err := sqlmigrate.GetMigrationRecords(ctx, db)
if err != nil {
logger.Fatal("Could not get migration records, run `nakama migrate up`", zap.Error(err))
Expand Down Expand Up @@ -104,6 +106,8 @@ func (ms *migrationService) up(ctx context.Context, logger *zap.Logger, db *pgx.
ms.limit = 0
}

logger.Info("Applying database migrations", zap.Int("limit", ms.limit))

appliedMigrations, err := sqlmigrate.ExecMax(ctx, db, ms.migrations, sqlmigrate.Up, ms.limit)
if err != nil {
logger.Fatal("Failed to apply migrations", zap.Int("count", appliedMigrations), zap.Error(err))
Expand All @@ -117,6 +121,8 @@ func (ms *migrationService) down(ctx context.Context, logger *zap.Logger, db *pg
ms.limit = 1
}

logger.Info("Reverting database migrations", zap.Int("limit", ms.limit))

appliedMigrations, err := sqlmigrate.ExecMax(ctx, db, ms.migrations, sqlmigrate.Down, ms.limit)
if err != nil {
logger.Fatal("Failed to migrate back", zap.Int("count", appliedMigrations), zap.Error(err))
Expand All @@ -130,6 +136,8 @@ func (ms *migrationService) redo(ctx context.Context, logger *zap.Logger, db *pg
logger.Warn("Limit is ignored when redo is invoked")
}

logger.Info("Reapplying database migrations", zap.Int("limit", ms.limit))

appliedMigrations, err := sqlmigrate.ExecMax(ctx, db, ms.migrations, sqlmigrate.Down, 1)
if err != nil {
logger.Fatal("Failed to migrate back", zap.Int("count", appliedMigrations), zap.Error(err))
Expand Down
3 changes: 1 addition & 2 deletions server/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ var (
}
metrics = NewLocalMetrics(logger, logger, nil, cfg)
storageIdx, _ = NewLocalStorageIndex(logger, nil, &StorageConfig{DisableIndexOnly: false}, metrics)
_ = CheckConfig(logger, cfg)
_ = ValidateConfig(logger, cfg)
_ = cfg.Validate(logger)
)

type DummyMessageRouter struct{}
Expand Down
2 changes: 1 addition & 1 deletion server/core_notification.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func NotificationSend(ctx context.Context, logger *zap.Logger, db *sql.DB, track
}

recipients := make(map[PresenceStream][]*PresenceID, len(notifications))
for userID, _ := range notifications {
for userID := range notifications {
recipients[PresenceStream{Mode: StreamModeNotifications, Subject: userID}] = make([]*PresenceID, 0, 1)
}
tracker.ListPresenceIDByStreams(recipients)
Expand Down

0 comments on commit fcefdc4

Please sign in to comment.