diff --git a/ruby/lib/jam_ruby/resque/jam_tracks_builder.rb b/ruby/lib/jam_ruby/resque/jam_tracks_builder.rb index 1dcf80367..cc782a5ec 100644 --- a/ruby/lib/jam_ruby/resque/jam_tracks_builder.rb +++ b/ruby/lib/jam_ruby/resque/jam_tracks_builder.rb @@ -6,20 +6,24 @@ require 'digest/md5' module JamRuby class JamTracksBuilder + extend JamRuby::ResqueStats + @queue = :jam_tracks_builder - @@log = Logging.logger[JamTracksBuilder] + + def log + @log || Logging.logger[JamTracksBuilder] + end + attr_accessor :jam_track_right_id def self.perform(jam_track_right_id) - JamWebEventMachine.run_wait_stop do - jam_track_builder = JamTracksBuilder.new() - jam_track_builder.jam_track_right_id = jam_track_right_id - jam_track_builder.run - end + jam_track_builder = JamTracksBuilder.new() + jam_track_builder.jam_track_right_id = jam_track_right_id + jam_track_builder.run end def run - @@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}") @jam_track_right = JamTrackRight.find(jam_track_right_id) JamRuby::JamTracksManager.save_jam_track_right_jkz(@jam_track_right) @@ -28,7 +32,7 @@ module JamRuby @jam_track_right.finish_sign(length, md5.to_s) - puts "Signed jamtrack to #{@jam_track_right[:url]}" + log.info "Signed jamtrack to #{@jam_track_right[:url]}" end end end \ No newline at end of file diff --git a/ruby/lib/jam_ruby/resque/scheduled/jam_tracks_cleaner.rb b/ruby/lib/jam_ruby/resque/scheduled/jam_tracks_cleaner.rb index 3ef073b01..f892f617f 100644 --- a/ruby/lib/jam_ruby/resque/scheduled/jam_tracks_cleaner.rb +++ b/ruby/lib/jam_ruby/resque/scheduled/jam_tracks_cleaner.rb @@ -8,11 +8,13 @@ module JamRuby # periodically scheduled to find jam_tracks to cleanup class JamTracksCleaner - extend Resque::Plugins::LonelyJob + extend Resque::Plugins::JamLonelyJob @queue = :jam_tracks_cleaner - @@log = Logging.logger[JamTracksCleaner] + def log + @log || Logging.logger[JamTracksCleaner] + end def self.lock_timeout # this should be enough time to make sure the job has finished, but not so long that the system isn't recovering from a abandoned job @@ -21,7 +23,7 @@ module JamRuby def self.perform JamTrackRight.ready_to_clean.each do |jam_track_right| - @@log.debug("deleting files for jam_track_right #{jam_track_right.id}") + log.debug("deleting files for jam_track_right #{jam_track_right.id}") jam_track_right.delete_s3_files end end