这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix Storage#write_file to be thread-safe #34

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 2 commits into from
Closed

Fix Storage#write_file to be thread-safe #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b59796f
Fix Storage#write_file to be thread-safe
Sep 4, 2012
18d6e7b
Add thread lock for index files
Sep 14, 2012
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
36 changes: 21 additions & 15 deletions lib/acts_as_indexed/storage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,35 +155,41 @@ def encode_character(char)
end

def write_file(file_path)
new_file = file_path.to_s
tmp_file = new_file + TEMP_FILE_EXTENSION
new_file_name = file_path.to_s
temp_file_name = new_file_name + TEMP_FILE_EXTENSION

# Windows doesn't seem to play nice with writing then moving the file.
# https://github.com/dougal/acts_as_indexed/issues/15
writeable_file = windows? ? new_file : tmp_file
writeable_file = windows? ? new_file_name : temp_file_name

File.open(writeable_file, 'w+') do |f|
yield(f)
end

FileUtils.mv(tmp_file, new_file) unless windows?
FileUtils.mv(temp_file_name, new_file_name) unless windows?
end

@@file_lock = Mutex.new

# Borrowed from Rails' ActiveSupport FileStore. Also under MIT licence.
# Lock a file for a block so only one process can modify it at a time.
# Lock a file for a block so only one process or thread can modify it at a time.
def lock_file(file_path, &block) # :nodoc:
# Windows does not support file locking.
if !windows? && file_path.exist?
file_path.open('r+') do |f|
begin
f.flock File::LOCK_EX
yield
ensure
f.flock File::LOCK_UN
@@file_lock.synchronize do

# Windows does not support file locking.
if !windows? && file_path.exist?
file_path.open('r+') do |f|
begin
f.flock File::LOCK_EX
yield
ensure
f.flock File::LOCK_UN
end
end
else
yield
end
else
yield

end
end

Expand Down