Commit 08fb0002 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Better validation of tournament duration when a reset schedule is set.

parent b0b88b92

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
## [Unreleased]

### Fixed

- Use leaderboard expires rather than end active IDs with leaderboard resets.

- Better validation of tournament duration when a reset schedule is set.



## [2.1.0] - 2018-10-08

### Added

server/leaderboard_cache.go

+8 −4
Original line number Diff line number Diff line
@@ -484,13 +484,17 @@ func checkTournamentConfig(resetSchedule string, startTime, endTime, duration, m 
	}



	if cron != nil {

		startTimeUtc := time.Unix(int64(startTime), 0).UTC()

		nextReset := cron.Next(startTimeUtc).Unix()

		if (endTime > 0) && (int64(endTime) <= nextReset) {

		schedules := cron.NextN(time.Unix(int64(startTime), 0).UTC(), 2)

		firstResetUnix := schedules[0].UTC().Unix()

		secondResetUnix := schedules[1].UTC().Unix()



		// Check that the end time (if specified) is at least strictly after the first active period start time.

		if (endTime > 0) && (int64(endTime) <= firstResetUnix) {

			return fmt.Errorf("tournament end time cannot be before first reset schedule - either increase end time or change/disable reset schedule")

		}



		if nextReset < int64(startTime+duration) {

		// Check that the gap between resets is >= the duration of each tournament round.

		if secondResetUnix-firstResetUnix < int64(duration) {

			return fmt.Errorf("tournament cannot be scheduled to be reset while it is ongoing - either decrease duration or change/disable reset schedule")

		}

	}