Skip to content
Merged
Changes from all commits
Commits
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
23 changes: 10 additions & 13 deletions lib/fluent/plugin/fluent_package_update_checker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def tags_cached?
end

def cached_tags_path
ENV["FLUENT_PACKAGE_TAGS_PATH"] ?
ENV["FLUENT_PACKAGE_TAGS_PATH"] ?
ENV["FLUENT_PACKAGE_TAGS_PATH"] : "#{@tmp_dir}/fluent-package-tags.json"
end

Expand All @@ -51,20 +51,16 @@ def release_tags_url
end

def fetch_tags
begin
if tags_cached?
yield JSON.parse(File.open(cached_tags_path).read)
else
URI.open(release_tags_url) do |resource|
File.open(cached_tags_path, "w+") do |f|
json = resource.read
f.write(json)
yield JSON.parse(json)
end
if tags_cached?
yield JSON.parse(File.open(cached_tags_path).read)
else
URI.open(release_tags_url) do |resource|
File.open(cached_tags_path, "w+") do |f|
json = resource.read
f.write(json)
yield JSON.parse(json)
end
end
rescue => e
@logger.error "Failed to fetch tags", error: e
end
end

Expand Down Expand Up @@ -176,6 +172,7 @@ def check_update_versions
end
end
end
ensure
FileUtils.rm_rf(@tmp_dir)
end

Expand Down
Loading