seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-2782 : Fix error found by test.

This commit is contained in:
Steven Miers 2015-02-27 11:38:40 -06:00
parent a34031728e
commit 003b06cae0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/jam_tracks_manager.rb
View File

@ -79,7 +79,7 @@ module JamRuby
http.request request do |response|
response_code = response.code.to_i
unless response_code >= 200 && response_code <= 299
puts "Response from server was #{response_code} / #{response.message}"
@@log.info "Response from server was #{response_code} / #{response.message}"
raise "bad status code: #{response_code}. body: #{response.body}"
end
response.read_body do |chunk|

14
ruby/lib/jam_ruby/resque/jam_tracks_builder.rb
View File

@ -14,7 +14,7 @@ module JamRuby
@log || Logging.logger[JamTracksBuilder]
end
def self.perform(jam_track_right_id, bitrate=48)
def self.perform(jam_track_right_id, bitrate=48)
jam_track_builder = JamTracksBuilder.new()
jam_track_builder.jam_track_right_id = jam_track_right_id
jam_track_builder.bitrate=bitrate
@ -22,9 +22,9 @@ module JamRuby
end
def run
bitrate ||= 48
self.bitrate ||= 48
begin
log.info("jam_track_builder job starting. jam_track_right_id #{jam_track_right_id}, bitrate: #{bitrate}")
log.info("jam_track_builder job starting. jam_track_right_id #{jam_track_right_id}, bitrate: #{self.bitrate}")
begin
@jam_track_right = JamTrackRight.find(jam_track_right_id)
@ -36,14 +36,14 @@ module JamRuby
# track that it's started ( and avoid db validations )
JamTrackRight.where(:id => @jam_track_right.id).update_all(:signing_started_at => Time.now, :should_retry => false)
JamRuby::JamTracksManager.save_jam_track_right_jkz(@jam_track_right, bitrate)
JamRuby::JamTracksManager.save_jam_track_right_jkz(@jam_track_right, self.bitrate)
# If bitrate is 48 (the default), use that URL. Otherwise, use 44kHz:
length = (bitrate==48) ? @jam_track_right.url_48.size() : @jam_track_right.url_44.size()
length = (self.bitrate==48) ? @jam_track_right.url_48.size() : @jam_track_right.url_44.size()
md5 = Digest::MD5.new
@jam_track_right.finish_sign(length, md5.to_s, bitrate)
@jam_track_right.finish_sign(length, md5.to_s, self.bitrate)
log.info "Signed #{bitrate}kHz jamtrack to #{@jam_track_right[:url]}"
log.info "Signed #{self.bitrate}kHz jamtrack to #{@jam_track_right[:url]}"
rescue Exception => e
# record the error in the database
post_error(e)