kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

Merge pull request #3307 from evertrue/evertrue/eherot/do_not_unnecessarily_throw_path_style_warning 

Do not throw a warning about falling back to path_style
This commit is contained in:
Wesley Beary 2014-12-02 10:59:44 -06:00
parent 46a7a47d04 09666e0910
commit ccf96e75a1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fog/aws/storage.rb
View File

@ -220,13 +220,15 @@ module Fog
bucket_name = params[:bucket_name] bucket_name = params[:bucket_name]
path_style = params.fetch(:path_style, @path_style) path_style = params.fetch(:path_style, @path_style)
if !path_style && COMPLIANT_BUCKET_NAMES !~ bucket_name if !path_style
if COMPLIANT_BUCKET_NAMES !~ bucket_name
Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html") Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
path_style = true path_style = true
elsif scheme == 'https' && bucket_name =~ /\./ elsif scheme == 'https' && bucket_name =~ /\./
Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) contains a '.' so is not accessible over https as a virtual hosted bucket, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html") Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) contains a '.' so is not accessible over https as a virtual hosted bucket, which will negatively impact performance. For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
path_style = true path_style = true
end end
end
if path_style if path_style
path = bucket_to_path bucket_name, path path = bucket_to_path bucket_name, path