From a417760337cbe9ea43edf4681f9f970e61665dde Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Fri, 19 Jan 2024 12:55:24 +0100 Subject: [PATCH] FIX: Rake task executed wrong method (#25323) Rake files share methods with all other rake files and there is already a `rebake_posts` method in another rake file. --- lib/tasks/import.rake | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index 01bed1cb501..19e99eb2d3c 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -735,7 +735,7 @@ task "import:rebake_uncooked_posts_with_polls" => :environment do posts = Post.where("EXISTS (SELECT 1 FROM polls WHERE polls.post_id = posts.id)") - rebake_posts(posts) + import_rebake_posts(posts) end desc "Rebake posts that contain events" @@ -747,7 +747,7 @@ task "import:rebake_uncooked_posts_with_events" => :environment do "EXISTS (SELECT 1 FROM discourse_post_event_events WHERE discourse_post_event_events.id = posts.id)", ) - rebake_posts(posts) + import_rebake_posts(posts) end desc "Rebake posts that have tag" @@ -760,21 +760,21 @@ task "import:rebake_uncooked_posts_with_tag", [:tag_name] => :environment do |_t args[:tag_name], ) - rebake_posts(posts) + import_rebake_posts(posts) end -def rebake_posts(posts) +def import_rebake_posts(posts) Jobs.run_immediately! OptimizedImage.lock_per_machine = false + posts = posts.where("baked_version <> ? or baked_version IS NULL", Post::BAKED_VERSION) + max_count = posts.count current_count = 0 - posts - .where("baked_version <> ? or baked_version IS NULL", Post::BAKED_VERSION) - .find_each(order: :desc) do |post| - post.rebake! - current_count += 1 - print "\r%7d / %7d" % [current_count, max_count] - end + posts.find_each(order: :desc) do |post| + post.rebake! + current_count += 1 + print "\r%7d / %7d" % [current_count, max_count] + end end