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

Allow longer signing and fix importer

This commit is contained in:
Seth Call 2021-01-31 09:27:37 -06:00
parent 823720f217
commit d156d7f606
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/app/admin/school_user_uploads.rb
View File

@ -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

2
ruby/lib/jam_ruby/models/mix.rb
View File

@ -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

2
ruby/lib/jam_ruby/models/quick_mix.rb
View File

@ -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