Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Make `Jobs::MigrateUploadScheme` a scheduled job. 

This reverts https://github.com/discourse/discourse/commit/9d8db11c

If the job fails during execution or if `SiteSetting.migrate_to_new_scheme`
has been set to `false`, the job will be considered as executed even
though the migration has not been completed. As a result, the job
will have to be executed manually which is not desirable.
This commit is contained in:
Guo Xiang Tan 2016-09-02 11:32:51 +08:00
parent efd7cbd887
commit a869d861f4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/jobs/onceoff/migrate_upload_scheme.rb
View File

@ -1,8 +1,10 @@
module Jobs module Jobs
class MigrateUploadScheme < Jobs::Onceoff class MigrateUploadScheme < Jobs::Scheduled
every 10.minutes
sidekiq_options retry: false
def execute_onceoff(args) def execute(args)
return unless SiteSetting.migrate_to_new_scheme return unless SiteSetting.migrate_to_new_scheme
# clean up failed uploads # clean up failed uploads
@ -11,7 +13,7 @@ module Jobs
.destroy_all .destroy_all
# migrate uploads to new scheme # migrate uploads to new scheme
problems = Upload.migrate_to_new_scheme problems = Upload.migrate_to_new_scheme(50)
problems.each do |hash| problems.each do |hash|
upload_id = hash[:upload].id upload_id = hash[:upload].id
Discourse.handle_job_exception(hash[:ex], error_context(args, "Migrating upload id #{upload_id}", upload_id: upload_id)) Discourse.handle_job_exception(hash[:ex], error_context(args, "Migrating upload id #{upload_id}", upload_id: upload_id))
@ -23,7 +25,7 @@ module Jobs
OptimizedImage.where("upload_id NOT IN (SELECT id FROM uploads)").destroy_all OptimizedImage.where("upload_id NOT IN (SELECT id FROM uploads)").destroy_all
# migrate optimized_images to new scheme # migrate optimized_images to new scheme
problems = OptimizedImage.migrate_to_new_scheme problems = OptimizedImage.migrate_to_new_scheme(50)
problems.each do |hash| problems.each do |hash|
optimized_image_id = hash[:optimized_image].id optimized_image_id = hash[:optimized_image].id
Discourse.handle_job_exception(hash[:ex], error_context(args, "Migrating optimized_image id #{optimized_image_id}", optimized_image_id: optimized_image_id)) Discourse.handle_job_exception(hash[:ex], error_context(args, "Migrating optimized_image id #{optimized_image_id}", optimized_image_id: optimized_image_id))