From 64a64e99bb1ac20a4914b73cc5457852f94def8c Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 12 May 2015 08:47:26 -0500 Subject: [PATCH] * VRFS-2680 - try out audiomixer/quick mixer without secure PUT --- ruby/lib/jam_ruby/models/mix.rb | 4 ++-- ruby/lib/jam_ruby/models/quick_mix.rb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ruby/lib/jam_ruby/models/mix.rb b/ruby/lib/jam_ruby/models/mix.rb index 0c4eb238d..b58a4af05 100644 --- a/ruby/lib/jam_ruby/models/mix.rb +++ b/ruby/lib/jam_ruby/models/mix.rb @@ -321,9 +321,9 @@ module JamRuby def sign_put(expiration_time = 3600 * 24, type='ogg') type ||= 'ogg' if type == 'ogg' - s3_manager.sign_url(self[:ogg_url], {:expires => expiration_time, :content_type => 'audio/ogg', :secure => true}, :put) + s3_manager.sign_url(self[:ogg_url], {:expires => expiration_time, :content_type => 'audio/ogg', :secure => false}, :put) else - s3_manager.sign_url(self[:mp3_url], {:expires => expiration_time, :content_type => 'audio/mpeg', :secure => true}, :put) + s3_manager.sign_url(self[:mp3_url], {:expires => expiration_time, :content_type => 'audio/mpeg', :secure => false}, :put) end end diff --git a/ruby/lib/jam_ruby/models/quick_mix.rb b/ruby/lib/jam_ruby/models/quick_mix.rb index 1742a490a..4053fdaa3 100644 --- a/ruby/lib/jam_ruby/models/quick_mix.rb +++ b/ruby/lib/jam_ruby/models/quick_mix.rb @@ -232,12 +232,13 @@ module JamRuby end end + # this is not 'secure' because, in testing, the PUT failed often in Ruby. should investigate more. def sign_put(expiration_time = 3600 * 24, type='ogg') type ||= 'ogg' if type == 'ogg' - s3_manager.sign_url(self[:ogg_url], {:expires => expiration_time, :content_type => 'audio/ogg', :secure => true}, :put) + s3_manager.sign_url(self[:ogg_url], {:expires => expiration_time, :content_type => 'audio/ogg', :secure => false}, :put) else - s3_manager.sign_url(self[:mp3_url], {:expires => expiration_time, :content_type => 'audio/mpeg', :secure => true}, :put) + s3_manager.sign_url(self[:mp3_url], {:expires => expiration_time, :content_type => 'audio/mpeg', :secure => false}, :put) end end