Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3 -> master #148

Merged
merged 42 commits into from
Nov 8, 2017
Merged

Merge 3 -> master #148

merged 42 commits into from
Nov 8, 2017

Conversation

dhensby
Copy link
Contributor

@dhensby dhensby commented Nov 6, 2017

my merge of 3 into master

Damian Mooyman and others added 30 commits November 17, 2016 10:15
Added a note that the CleanupJob needs to be triggered manually once for it to start running every day.
If a job breaks (exception or similar) its status should be set to "Broken",
however if it _also_ exceeds memory or time limits, it _could_ be then set
to "Wait" again, when it should remain broken.
…ing saved in American format irrespective of the user's chosen DateFormat setting.
Solved issue symbiote#114 where a job's StartAfter date was always being save…
Feature add defaultJobs yml config for setting up a list of required jobs
Add check for status paused to default job check
Making inclusion-duration of finished jobs configurable
…orRestart()' causes the job to say its "Running" indefinitely.

(Commit on behalf of Jake)
…statement would always cause zero outputting of errors to console. Modified logic to align with Core silverstripe functions
…sages

fix(JobErrorHandler): Output error messages in console again
Before this patch, if there were no jobs to clean up, no new CleanupJob
was scheduled because of a premature return in process().
Always enqueue a new CleanupJob when complete
…waiting" case and completed successfully, it would not run the 'afterComplete' logic.
@dhensby
Copy link
Contributor Author

dhensby commented Nov 6, 2017

gah - I merged 2.10 into master not 3 - I'll reopen this tomorrow when I've done it properly :(

@dhensby
Copy link
Contributor Author

dhensby commented Nov 7, 2017

OK - merged 3 - I expect some style and test failures and I'll look into them when travis comes back to me

@dhensby dhensby force-pushed the master branch 5 times, most recently from f06f931 to dbbd9d4 Compare November 8, 2017 10:16
@dhensby
Copy link
Contributor Author

dhensby commented Nov 8, 2017

green :)

@robbieaverill robbieaverill merged commit 4450ccb into symbiote:master Nov 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants