Skip to content

Make #fetch_events_async and #fetch_comments_async thread-safe #729

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Make #fetch_events_async and #fetch_comments_async thread-safe #729

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions lib/github_changelog_generator/octo_fetcher.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def initialize(options = {})
prepare_cache
configure_octokit_ssl
@client = Octokit::Client.new(github_options)
@clients = (0...MAX_THREAD_NUMBER).map { Octokit::Client.new(github_options) }
end

def prepare_cache
Expand Down Expand Up @@ -191,10 +192,10 @@ def fetch_events_async(issues)
preview = { accept: Octokit::Preview::PREVIEW_TYPES[:project_card_events] }

issues.each_slice(MAX_THREAD_NUMBER) do |issues_slice|
issues_slice.each do |issue|
threads << Thread.new do
issues_slice.each_with_index do |issue, j|
threads << Thread.new(@clients[j]) do |client|
issue["events"] = []
iterate_pages(@client, "issue_events", issue["number"], preview) do |new_event|
iterate_pages(client, "issue_events", issue["number"], preview) do |new_event|
issue["events"].concat(new_event)
end
issue["events"] = issue["events"].map { |event| stringify_keys_deep(event.to_hash) }
Expand All @@ -220,10 +221,10 @@ def fetch_comments_async(prs)
threads = []

prs.each_slice(MAX_THREAD_NUMBER) do |prs_slice|
prs_slice.each do |pr|
threads << Thread.new do
prs_slice.each_with_index do |pr, i|
threads << Thread.new(@clients[i]) do |client|
pr["comments"] = []
iterate_pages(@client, "issue_comments", pr["number"]) do |new_comment|
iterate_pages(client, "issue_comments", pr["number"]) do |new_comment|
pr["comments"].concat(new_comment)
end
pr["comments"] = pr["comments"].map { |comment| stringify_keys_deep(comment.to_hash) }
Expand Down