Resolve next scheduling ploblems #76
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eagletmt
reviewed
Jul 4, 2017
app/models/kuroko2/job_schedule.rb
Outdated
|
|
||
| launch_schedule = Chrono::Schedule.new(cron) | ||
| schedule = CHRONO_SCHEDULE_METHODS.each_with_object({}) do |method, h| | ||
| h[method] = launch_schedule.send(method) |
There was a problem hiding this comment.
[nits] Use public_send to clarify that it doesn't try to call private method.
app/models/kuroko2/job_schedule.rb
Outdated
| job_definition.job_suspend_schedules.each do |suspend_schedule_model| | ||
| suspend_schedule = Chrono::Schedule.new(suspend_schedule_model.cron) | ||
| CHRONO_SCHEDULE_METHODS.each do |method| | ||
| schedule[method] = schedule[method] - suspend_schedule.send(method) |
There was a problem hiding this comment.
[nits] schedule[method] -= suspended_schedule.public_send(method)
| td data-value=next_job_schedule.to_i = l(next_job_schedule, format: :short) | ||
| - else | ||
| td data-value="9999999990" | ||
| span class="small" Suspended |
There was a problem hiding this comment.
I think "Suspended" is confusing word because job definition has "suspended" status and it is displayed as "--".
aamine
reviewed
Jul 4, 2017
spec/models/job_schedule_spec.rb
Outdated
| context 'If the schedule has wdays and days' do | ||
| let(:cron) { '0 10 2 * 0' } | ||
| it 'returns nil' do | ||
| expect(schedule.next(time)).to eq(Time.new(2016, 2, 2, 10, 0)) |
There was a problem hiding this comment.
[nits] Says "it returns nil" but does not return nil
spec/models/job_schedule_spec.rb
Outdated
| context 'If the schedule has wdays and days' do | ||
| let(:cron) { '0 10 1 * 1' } | ||
| it 'returns nil' do | ||
| expect(schedule.next(time)).to eq(Time.new(2016, 1, 4, 10, 0)) |
|
@cookpad/dev-infra Adding some changes. Please rereview. The view of showing error messages when invalid suspend job schedule inputted is below.
|
aamine
approved these changes
Jul 6, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove 1 month since limitation, and add checking
suspended_all?eisuke@31d37c6 using Chrono::ScheduleSearching next
schedules costs has been improved eisuke@dc95ab9
Fix infinite loop when suspend schedule has wdays and days eisuke@5ba258f
@cookpad/dev-infra please review