From 2a74d7ec9a5e42141a3e442d4b5dc0ff01e3cdc8 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Thu, 19 Nov 2015 11:22:41 -0600 Subject: [PATCH] * record crash dump description --- db/manifest | 1 + db/up/add_description_to_crash_dumps.sql | 1 + ruby/lib/jam_ruby/jam_track_importer.rb | 6 +++--- web/app/controllers/api_users_controller.rb | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 db/up/add_description_to_crash_dumps.sql diff --git a/db/manifest b/db/manifest index bc0c3e7c2..d9e1fb8b2 100755 --- a/db/manifest +++ b/db/manifest @@ -311,3 +311,4 @@ affiliate_partner_rate.sql track_downloads.sql jam_track_lang_idx.sql giftcard.sql +add_description_to_crash_dumps.sql \ No newline at end of file diff --git a/db/up/add_description_to_crash_dumps.sql b/db/up/add_description_to_crash_dumps.sql new file mode 100644 index 000000000..e08540d85 --- /dev/null +++ b/db/up/add_description_to_crash_dumps.sql @@ -0,0 +1 @@ +ALTER TABLE crash_dumps ADD COLUMN description VARCHAR(20000); \ No newline at end of file diff --git a/ruby/lib/jam_ruby/jam_track_importer.rb b/ruby/lib/jam_ruby/jam_track_importer.rb index 1646708d7..0b56d49d7 100644 --- a/ruby/lib/jam_ruby/jam_track_importer.rb +++ b/ruby/lib/jam_ruby/jam_track_importer.rb @@ -60,8 +60,8 @@ module JamRuby end if click_track - click_track_file = File.join(tmp_dir, File.basename(click_track[:url])) - JamTrackImporter.song_storage_manager.download(click_track[:url], click_track_file) + click_track_file = File.join(tmp_dir, File.basename(click_track[:original_filename])) + JamTrackImporter.song_storage_manager.download(click_track[:original_filename], click_track_file) else # we'll use the master for click analysis. not ideal, but would work click_track_file = master_track_file @@ -88,7 +88,7 @@ module JamRuby jmep = "" jmep << "# created via code using bpm/silence detection (bpm:#{bpm})\r\n" jmep << "prelude@10.0 #number of seconds before music starts\r\n" - jmep << "metro_fin@#{metro_fin} bpm=#{bpm.round}, ticks=8, pmode=stream, name=Beep, play=mono" + jmep << "metro_fin@#{metro_fin} bpm=#{bpm}, ticks=8, pmode=stream, name=Beep, play=mono" @@log.info("jmep generated: #{jmep}") diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb index 05eed5887..e664e4697 100644 --- a/web/app/controllers/api_users_controller.rb +++ b/web/app/controllers/api_users_controller.rb @@ -599,6 +599,7 @@ ApiUsersController < ApiController @dump.user_id = params[:user_id] @dump.session_id = params[:session_id] @dump.timestamp = params[:timestamp] + @dump.description = params[:description] unless @dump.save # There are at least some conditions on valid dumps (need client_type)