Cleanup

ruby/lib/jam_ruby/resque/jam_tracks_builder.rb

@@ -7,16 +7,14 @@ require 'digest/md5'
 module JamRuby
   class JamTracksBuilder
     extend JamRuby::ResqueStats
-    attr_accessor :bitrate
+    attr_accessor :jam_track_right_id, :bitrate
     @queue = :jam_tracks_builder
 
     def log
       @log || Logging.logger[JamTracksBuilder]
     end
 
-    attr_accessor :jam_track_right_id
-
-    def self.perform(jam_track_right_id, bitrate)
+    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
@@ -24,9 +22,9 @@ module JamRuby
     end
 
     def run
+      bitrate ||= 48
       begin
-        log.info("jam_track_builder job starting. jam_track_right_id #{jam_track_right_id}")
-
+        log.info("jam_track_builder job starting. jam_track_right_id #{jam_track_right_id}, bitrate: #{bitrate}")
         begin
           @jam_track_right = JamTrackRight.find(jam_track_right_id)
 
@@ -38,15 +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)
 
-          length = bitrate==48 ? @jam_track_right.url_48.size() : @jam_track_right.url_44.size()
+          # 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()
           md5 = Digest::MD5.new
           @jam_track_right.finish_sign(length, md5.to_s, bitrate)
 
-          log.info "Signed jamtrack to #{@jam_track_right[:url]}"
-
+          log.info "Signed #{bitrate}kHz jamtrack to #{@jam_track_right[:url]}"
         rescue Exception => e
           # record the error in the database
           post_error(e)