twhelp
/
dataupdater
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed error messages

This commit is contained in:
Dawid Wysokiński 2020-10-24 20:49:02 +02:00
parent 92adb94132
commit 4b3a652f71
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cron/update_server_data_worker.go
View File

@ -376,7 +376,7 @@ func (h *updateServerDataWorker) loadEnnoblements() ([]*models.Ennoblement, map[
Limit(1).
Order("ennobled_at DESC").
Select(); err != nil && err != pg.ErrNoRows {
return nil, nil, errors.Wrapf(err, "cannot load last ennoblement, url %s", url)
return nil, nil, errors.Wrapf(err, "couldnt load last ennoblement, url %s", url)
}
firstEnnoblementByID := make(map[int]*models.Ennoblement)
@ -384,7 +384,7 @@ func (h *updateServerDataWorker) loadEnnoblements() ([]*models.Ennoblement, map[
for _, line := range lines {
ennoblement, err := h.parseEnnoblementLine(line)
if err != nil {
return nil, nil, errors.Wrapf(err, "cannot parse line, url %s", url)
return nil, nil, errors.Wrapf(err, "couldnt parse line, url %s", url)
}
if otherEnnoblement, ok := firstEnnoblementByID[ennoblement.NewOwnerID]; !ok ||
otherEnnoblement.EnnobledAt.After(ennoblement.EnnobledAt) {
@ -570,13 +570,13 @@ func (h *updateServerDataWorker) update() error {
Set("dominance = EXCLUDED.dominance").
Apply(appendODSetClauses).
Insert(); err != nil {
return errors.Wrap(err, "cannot insert tribes")
return errors.Wrap(err, "couldnt insert tribes")
}
if _, err := tx.Model(&tribes).
Where("tribe.id NOT IN (?)", pg.In(ids)).
Set("exists = false").
Update(); err != nil && err != pg.ErrNoRows {
return errors.Wrap(err, "cannot update nonexistent tribes")
return errors.Wrap(err, "couldnt update nonexistent tribes")
}
tribesHistory := []*models.TribeHistory{}
@ -586,7 +586,7 @@ func (h *updateServerDataWorker) update() error {
Where("tribe_id IN (?)", pg.In(ids)).
Order("tribe_id DESC", "create_date DESC").
Select(); err != nil && err != pg.ErrNoRows {
return errors.Wrap(err, "cannot select tribe history records")
return errors.Wrap(err, "couldnt select tribe history records")
}
todaysTribeStats := h.calculateTodaysTribeStats(tribes, tribesHistory)
if len(todaysTribeStats) > 0 {
@ -601,7 +601,7 @@ func (h *updateServerDataWorker) update() error {
Set("dominance = EXCLUDED.dominance").
Apply(appendODSetClauses).
Insert(); err != nil {
return errors.Wrap(err, "cannot insert today's tribe stats")
return errors.Wrap(err, "couldnt insert today's tribe stats")
}
}
}
@ -621,13 +621,13 @@ func (h *updateServerDataWorker) update() error {
Set("daily_growth = EXCLUDED.daily_growth").
Apply(appendODSetClauses).
Insert(); err != nil {
return errors.Wrap(err, "cannot insert players")
return errors.Wrap(err, "couldnt insert players")
}
if _, err := tx.Model(&models.Player{}).
Where("id NOT IN (?)", pg.In(ids)).
Set("exists = false").
Update(); err != nil && err != pg.ErrNoRows {
return errors.Wrap(err, "cannot update nonexistent players")
return errors.Wrap(err, "couldnt update nonexistent players")
}
playerHistory := []*models.PlayerHistory{}
@ -636,7 +636,7 @@ func (h *updateServerDataWorker) update() error {
Column("*").
Where("player_id IN (?)", pg.In(ids)).
Order("player_id DESC", "create_date DESC").Select(); err != nil && err != pg.ErrNoRows {
return errors.Wrap(err, "cannot select player history records")
return errors.Wrap(err, "couldnt select player history records")
}
todaysPlayerStats := h.calculateDailyPlayerStats(players, playerHistory)
if len(todaysPlayerStats) > 0 {
@ -648,7 +648,7 @@ func (h *updateServerDataWorker) update() error {
Set("rank = EXCLUDED.rank").
Apply(appendODSetClauses).
Insert(); err != nil {
return errors.Wrap(err, "cannot insert today's player stats")
return errors.Wrap(err, "couldnt insert today's player stats")
}
}
@ -657,7 +657,7 @@ func (h *updateServerDataWorker) update() error {
if _, err := tx.Model(&models.Village{}).
Where("true").
Delete(); err != nil && err != pg.ErrNoRows {
return errors.Wrap(err, "cannot delete villages")
return errors.Wrap(err, "couldnt delete villages")
}
if _, err := tx.Model(&villages).
OnConflict("(id) DO UPDATE").
@ -668,12 +668,12 @@ func (h *updateServerDataWorker) update() error {
Set("bonus = EXCLUDED.bonus").
Set("player_id = EXCLUDED.player_id").
Insert(); err != nil {
return errors.Wrap(err, "cannot insert villages")
return errors.Wrap(err, "couldnt insert villages")
}
}
if len(ennoblements) > 0 {
if _, err := tx.Model(&ennoblements).Insert(); err != nil {
return errors.Wrap(err, "cannot insert ennoblements")
return errors.Wrap(err, "couldnt insert ennoblements")
}
return nil
}
@ -689,7 +689,7 @@ func (h *updateServerDataWorker) update() error {
Returning("*").
WherePK().
Update(); err != nil {
return errors.Wrap(err, "cannot update server")
return errors.Wrap(err, "couldnt update server")
}
return tx.Commit()

10
cron/update_server_history_worker.go
View File

@ -16,7 +16,7 @@ type updateServerHistoryWorker struct {
func (h *updateServerHistoryWorker) update() error {
players := []*models.Player{}
if err := h.db.Model(&players).Where("exists = true").Select(); err != nil {
return errors.Wrap(err, "cannot load players")
return errors.Wrap(err, "couldnt load players")
}
createDate := time.Now()
@ -35,7 +35,7 @@ func (h *updateServerHistoryWorker) update() error {
tribes := []*models.Tribe{}
if err := h.db.Model(&tribes).Where("exists = true").Select(); err != nil {
return errors.Wrap(err, "cannot load tribes")
return errors.Wrap(err, "couldnt load tribes")
}
th := []*models.TribeHistory{}
for _, tribe := range tribes {
@ -60,13 +60,13 @@ func (h *updateServerHistoryWorker) update() error {
if len(ph) > 0 {
if _, err := h.db.Model(&ph).Insert(); err != nil {
return errors.Wrap(err, "cannot insert players history")
return errors.Wrap(err, "couldnt insert players history")
}
}
if len(th) > 0 {
if _, err := h.db.Model(&th).Insert(); err != nil {
return errors.Wrap(err, "cannot insert tribes history")
return errors.Wrap(err, "couldnt insert tribes history")
}
}
@ -75,7 +75,7 @@ func (h *updateServerHistoryWorker) update() error {
WherePK().
Returning("*").
Update(); err != nil {
return errors.Wrap(err, "cannot update server")
return errors.Wrap(err, "couldnt update server")
}

20
cron/update_server_stats_worker.go
View File

@ -16,39 +16,39 @@ type updateServerStatsWorker struct {
func (h *updateServerStatsWorker) prepare() (*models.ServerStats, error) {
activePlayers, err := h.db.Model(&models.Player{}).Where("exists = true").Count()
if err != nil {
return nil, errors.Wrap(err, "cannot count active players")
return nil, errors.Wrap(err, "couldnt count active players")
}
inactivePlayers, err := h.db.Model(&models.Player{}).Where("exists = false").Count()
if err != nil {
return nil, errors.Wrap(err, "cannot count inactive players")
return nil, errors.Wrap(err, "couldnt count inactive players")
}
players := activePlayers + inactivePlayers
activeTribes, err := h.db.Model(&models.Tribe{}).Where("exists = true").Count()
if err != nil {
return nil, errors.Wrap(err, "cannot count active tribes")
return nil, errors.Wrap(err, "couldnt count active tribes")
}
inactiveTribes, err := h.db.Model(&models.Tribe{}).Where("exists = false").Count()
if err != nil {
return nil, errors.Wrap(err, "cannot count inactive tribes")
return nil, errors.Wrap(err, "couldnt count inactive tribes")
}
tribes := activeTribes + inactiveTribes
barbarianVillages, err := h.db.Model(&models.Village{}).Where("player_id = 0").Count()
if err != nil {
return nil, errors.Wrap(err, "cannot count barbarian villages")
return nil, errors.Wrap(err, "couldnt count barbarian villages")
}
bonusVillages, err := h.db.Model(&models.Village{}).Where("bonus <> 0").Count()
if err != nil {
return nil, errors.Wrap(err, "cannot count bonus villages")
return nil, errors.Wrap(err, "couldnt count bonus villages")
}
playerVillages, err := h.db.Model(&models.Village{}).Where("player_id <> 0").Count()
if err != nil {
return nil, errors.Wrap(err, "cannot count player villages")
return nil, errors.Wrap(err, "couldnt count player villages")
}
villages, err := h.db.Model(&models.Village{}).Count()
if err != nil {
return nil, errors.Wrap(err, "cannot count villages")
return nil, errors.Wrap(err, "couldnt count villages")
}
return &models.ServerStats{
@ -80,7 +80,7 @@ func (h *updateServerStatsWorker) update() error {
defer tx.Close()
if _, err := tx.Model(stats).Insert(); err != nil {
return errors.Wrap(err, "cannot insert server stats")
return errors.Wrap(err, "couldnt insert server stats")
}
_, err = tx.Model(h.server).
@ -89,7 +89,7 @@ func (h *updateServerStatsWorker) update() error {
Returning("*").
Update()
if err != nil {
return errors.Wrap(err, "cannot update server")
return errors.Wrap(err, "couldnt update server")
}
return tx.Commit()

8
cron/vacuum_server_db_worker.go
View File

@ -31,7 +31,7 @@ func (h *vacuumServerDBWorker) vacuum() error {
Where("player_id IN (Select id FROM players) OR player_history.create_date < ?", time.Now().Add(-1*day*90)).
Delete()
if err != nil {
return errors.Wrap(err, "cannot delete old player history records")
return errors.Wrap(err, "couldnt delete old player history records")
}
_, err = tx.Model(&models.TribeHistory{}).
@ -39,7 +39,7 @@ func (h *vacuumServerDBWorker) vacuum() error {
Where("tribe_id IN (Select id FROM tribes) OR tribe_history.create_date < ?", time.Now().Add(-1*day*90)).
Delete()
if err != nil {
return errors.Wrap(err, "cannot delete old tribe history records")
return errors.Wrap(err, "couldnt delete old tribe history records")
}
_, err = tx.Model(&models.DailyPlayerStats{}).
@ -47,7 +47,7 @@ func (h *vacuumServerDBWorker) vacuum() error {
Where("player_id IN (Select id FROM players) OR daily_player_stats.create_date < ?", time.Now().Add(-1*day*90)).
Delete()
if err != nil {
return errors.Wrap(err, "cannot delete old player stats records")
return errors.Wrap(err, "couldnt delete old player stats records")
}
_, err = tx.Model(&models.DailyTribeStats{}).
@ -55,7 +55,7 @@ func (h *vacuumServerDBWorker) vacuum() error {
Where("tribe_id IN (Select id FROM tribes) OR daily_tribe_stats.create_date < ?", time.Now().Add(-1*day*90)).
Delete()
if err != nil {
return errors.Wrap(err, "cannot delete old tribe stats records")
return errors.Wrap(err, "couldnt delete old tribe stats records")
}
return tx.Commit()