From d156d7f6060bf07286f02a01b3843f4b72fb8cf7 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 31 Jan 2021 09:27:37 -0600 Subject: [PATCH] Allow longer signing and fix importer --- admin/app/admin/school_user_uploads.rb | 2 +- ruby/lib/jam_ruby/models/mix.rb | 2 +- ruby/lib/jam_ruby/models/quick_mix.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/app/admin/school_user_uploads.rb b/admin/app/admin/school_user_uploads.rb index 73de5d84e..98cf0c8b6 100644 --- a/admin/app/admin/school_user_uploads.rb +++ b/admin/app/admin/school_user_uploads.rb @@ -22,7 +22,7 @@ ActiveAdmin.register_page "SchoolUserUploads" do school = School.autocreate_find_from_upload(school_name, school_tag) first_name = row['First Name'].strip last_name = row['Last Name'].strip - email_address = row['Email Address'].strip + email_address = row['Email Address'].strip.downcase license_start = parse_date(row['License Start Date'].strip) license_end = parse_date(row['License End Date'].strip) source = row['Source'].strip diff --git a/ruby/lib/jam_ruby/models/mix.rb b/ruby/lib/jam_ruby/models/mix.rb index 9ced0fe74..e88fa063f 100644 --- a/ruby/lib/jam_ruby/models/mix.rb +++ b/ruby/lib/jam_ruby/models/mix.rb @@ -63,7 +63,7 @@ module JamRuby def enqueue begin - Resque.enqueue(AudioMixer, self.id, self.sign_put(3600 * 24, 'ogg'), self.sign_put(3600 * 24, 'mp3')) + Resque.enqueue(AudioMixer, self.id, self.sign_put(3600 * 24 * 30, 'ogg'), self.sign_put(3600 * 24 * 30, 'mp3')) rescue # implies redis is down. we don't update started_at false diff --git a/ruby/lib/jam_ruby/models/quick_mix.rb b/ruby/lib/jam_ruby/models/quick_mix.rb index 205b99be2..09098cad2 100644 --- a/ruby/lib/jam_ruby/models/quick_mix.rb +++ b/ruby/lib/jam_ruby/models/quick_mix.rb @@ -145,7 +145,7 @@ module JamRuby def enqueue begin - Resque.enqueue(QuickMixer, self.id, self.sign_put(3600 * 24, 'mp3')) + Resque.enqueue(QuickMixer, self.id, self.sign_put(3600 * 24 * 30, 'mp3')) rescue Exception => e # implies redis is down. we don't update started_at by bailing out here false