Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

no verbose logging for failed downloads of gravatars

This commit is contained in:
Sam 2017-09-28 11:32:26 +10:00
parent 165b388158
commit b80320da5e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user_avatar.rb
View File

@ -24,7 +24,8 @@ class UserAvatar < ActiveRecord::Base
gravatar_url, gravatar_url,
max_file_size: SiteSetting.max_image_size_kb.kilobytes, max_file_size: SiteSetting.max_image_size_kb.kilobytes,
tmp_file_name: "gravatar", tmp_file_name: "gravatar",
skip_rate_limit: true skip_rate_limit: true,
verbose: false
) )
if tempfile if tempfile
upload = UploadCreator.new(tempfile, 'gravatar.png', origin: gravatar_url, type: "avatar").create_for(user_id) upload = UploadCreator.new(tempfile, 'gravatar.png', origin: gravatar_url, type: "avatar").create_for(user_id)

8
lib/file_helper.rb
View File

@ -20,7 +20,11 @@ class FileHelper
tmp_file_name:, tmp_file_name:,
follow_redirect: false, follow_redirect: false,
read_timeout: 5, read_timeout: 5,
skip_rate_limit: false) skip_rate_limit: false,
verbose: nil)
# verbose logging is default while debugging onebox
verbose = verbose.nil? ? true : verbose
url = "https:" + url if url.start_with?("//") url = "https:" + url if url.start_with?("//")
raise Discourse::InvalidParameters.new(:url) unless url =~ /^https?:\/\// raise Discourse::InvalidParameters.new(:url) unless url =~ /^https?:\/\//
@ -32,7 +36,7 @@ class FileHelper
).resolve ).resolve
unless uri.present? unless uri.present?
log(:error, "FinalDestination did not work for: #{url}") log(:error, "FinalDestination did not work for: #{url}") if verbose
return return
end end