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.

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

Jump to bottom

Make ResultMerger safe in parallel environment #223

Merged
merged 2 commits into from
Nov 20, 2013
Merged

Make ResultMerger safe in parallel environment #223

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
413f270
Lock resultset json file
tomykaira May 16, 2013
b5af664
Rescue LoadError and return empty set
tomykaira May 16, 2013
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
7 changes: 6 additions & 1 deletion lib/simplecov/result_merger.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ def resultset_path
# Loads the cached resultset from YAML and returns it as a Hash
def resultset
if stored_data
SimpleCov::JSON.parse(stored_data)
begin
SimpleCov::JSON.parse(stored_data)
rescue
{}
end
else
{}
end
Expand Down Expand Up @@ -66,6 +70,7 @@ def store_result(result)
command_name, data = result.to_hash.first
new_set[command_name] = data
File.open(resultset_path, "w+") do |f|
f.flock(File::LOCK_EX)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you have to release the lock after the puts statement in the following line?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

File close releases the lock.

f.puts SimpleCov::JSON.dump(new_set)
end
true
Expand Down