* VRFS-801 still working out some mixer devops issues now;
This commit is contained in:
parent
43572c1524
commit
a7fa73cfb3
|
|
@ -37,7 +37,8 @@ gem 'carrierwave', '0.9.0'
|
|||
gem 'carrierwave_direct'
|
||||
gem 'uuidtools', '2.1.2'
|
||||
gem 'bcrypt-ruby', '3.0.1'
|
||||
gem 'jquery-rails', '2.3.0' # pinned because jquery-ui-rails was split from jquery-rails, but activeadmin doesn't support this gem yet
|
||||
gem 'jquery-rails' # , '2.3.0' # pinned because jquery-ui-rails was split from jquery-rails, but activeadmin doesn't support this gem yet
|
||||
gem 'jquery-ui-rails'
|
||||
gem 'rails3-jquery-autocomplete'
|
||||
gem 'activeadmin', '0.6.2'
|
||||
gem 'mime-types', '1.25'
|
||||
|
|
@ -48,7 +49,8 @@ gem 'country-select'
|
|||
gem 'aasm', '3.0.16'
|
||||
gem 'postgres-copy', '0.6.0'
|
||||
gem 'aws-sdk', '1.29.1'
|
||||
gem 'bugsnag'
|
||||
gem 'bugsnag'
|
||||
gem 'gon'
|
||||
gem 'resque'
|
||||
gem 'resque-retry'
|
||||
gem 'resque-failed-job-mailer'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
ActiveAdmin.register JamRuby::Mix, :as => 'Errored Mixes' do
|
||||
|
||||
config.filters = true
|
||||
config.per_page = 50
|
||||
config.clear_action_items!
|
||||
config.sort_order = "created_at_desc"
|
||||
menu :parent => 'Sessions'
|
||||
|
||||
controller do
|
||||
|
||||
def scoped_collection
|
||||
Mix.where('error_reason is not NULL and completed = FALSE')
|
||||
end
|
||||
|
||||
def mix_again
|
||||
@mix = Mix.find(params[:id])
|
||||
@mix.enqueue
|
||||
render :json => {}
|
||||
end
|
||||
end
|
||||
|
||||
index :as => :block do |mix|
|
||||
div :for => mix do
|
||||
h3 "Mix (Users: #{mix.recording.users.map { |u| u.name }.join ','}) (When: #{mix.created_at.strftime('%b %d %Y, %H:%M')})"
|
||||
columns do
|
||||
column do
|
||||
panel 'Mix Details' do
|
||||
attributes_table_for(mix) do
|
||||
row :recording do |mix| auto_link(mix.recording, mix.recording.id) end
|
||||
row :created_at do |mix| mix.created_at.strftime('%b %d %Y, %H:%M') end
|
||||
row :s3_url do |mix| mix.url end
|
||||
row :manifest do |mix| mix.manifest end
|
||||
row :completed do |mix| "#{mix.completed ? "finished" : "not finished"}" end
|
||||
if mix.completed
|
||||
row :completed_at do |mix| mix.completed_at.strftime('%b %d %Y, %H:%M') end
|
||||
elsif mix.error_count > 0
|
||||
row :error_count do |mix| "#{mix.error_count} times failed" end
|
||||
row :error_reason do |mix| "last reason failed: #{mix.error_reason}" end
|
||||
row :error_detail do |mix| "last error detail: #{mix.error_detail}" end
|
||||
row :mix_again do |mix| div :class => 'mix-again' do
|
||||
span do link_to "Mix Again", '#', :class => 'mix-again', :'data-mix-id' => mix.id end
|
||||
span do div :class => 'mix-again-dialog' do end end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -6,6 +6,14 @@ ActiveAdmin.register JamRuby::Mix, :as => 'Mixes' do
|
|||
config.sort_order = "created_at_desc"
|
||||
menu :parent => 'Sessions'
|
||||
|
||||
controller do
|
||||
|
||||
def mix_again
|
||||
@mix = Mix.find(params[:id])
|
||||
@mix.enqueue
|
||||
render :json => {}
|
||||
end
|
||||
end
|
||||
|
||||
index :as => :block do |mix|
|
||||
div :for => mix do
|
||||
|
|
@ -25,7 +33,11 @@ ActiveAdmin.register JamRuby::Mix, :as => 'Mixes' do
|
|||
row :error_count do |mix| "#{mix.error_count} times failed" end
|
||||
row :error_reason do |mix| "last reason failed: #{mix.error_reason}" end
|
||||
row :error_detail do |mix| "last error detail: #{mix.error_detail}" end
|
||||
row :what do |mix| link_to "Your Mom", '/' end
|
||||
row :mix_again do |mix| div :class => 'mix-again' do
|
||||
span do link_to "Mix Again", '#', :class => 'mix-again', :'data-mix-id' => mix.id end
|
||||
span do div :class => 'mix-again-dialog' do end end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,2 +1,11 @@
|
|||
//= require active_admin/base
|
||||
//= require autocomplete-rails
|
||||
// //= require active_admin/base
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require jquery.ui.core
|
||||
//= require jquery.ui.widget
|
||||
//= require jquery.ui.datepicker
|
||||
//= require jquery.ui.dialog
|
||||
//= require active_admin/application
|
||||
//= require autocomplete-rails
|
||||
//= require base
|
||||
//= require_tree .
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
(function(context,$) {
|
||||
|
||||
/**
|
||||
* Javascript wrappers for the REST API
|
||||
*/
|
||||
|
||||
"use strict";
|
||||
|
||||
context.JK = context.JK || {};
|
||||
context.JK.RestAdmin = function() {
|
||||
|
||||
var self = this;
|
||||
var logger = context.JK.logger;
|
||||
|
||||
function tryMixAgain(options) {
|
||||
var mixId = options['mix_id']
|
||||
return $.ajax({
|
||||
type: "POST",
|
||||
dataType: "json",
|
||||
url: gon.global.prefix + 'api/mix/' + mixId + '/enqueue',
|
||||
contentType: 'application/json',
|
||||
processData: false
|
||||
});
|
||||
}
|
||||
|
||||
function initialize() {
|
||||
return self;
|
||||
}
|
||||
|
||||
// Expose publics
|
||||
this.initialize = initialize;
|
||||
this.tryMixAgain = tryMixAgain;
|
||||
|
||||
return this;
|
||||
};
|
||||
|
||||
|
||||
})(window,jQuery);
|
||||
|
|
@ -12,4 +12,3 @@
|
|||
//
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require_tree .
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
(function(context,$) {
|
||||
|
||||
context.JK = {}
|
||||
|
||||
var console_methods = [
|
||||
'log', 'debug', 'info', 'warn', 'error', 'assert',
|
||||
'clear', 'dir', 'dirxml', 'trace', 'group',
|
||||
'groupCollapsed', 'groupEnd', 'time', 'timeEnd',
|
||||
'timeStamp', 'profile', 'profileEnd', 'count',
|
||||
'exception', 'table'
|
||||
];
|
||||
|
||||
if ('undefined' === typeof(context.console)) {
|
||||
context.console = {};
|
||||
$.each(console_methods, function(index, value) {
|
||||
context.console[value] = $.noop;
|
||||
});
|
||||
}
|
||||
|
||||
context.JK.logger = context.console;
|
||||
|
||||
|
||||
})(window, jQuery);
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
(function(context,$) {
|
||||
|
||||
|
||||
var restAdmin = context.JK.RestAdmin();
|
||||
|
||||
$(function() {
|
||||
// convert mix again links to ajax
|
||||
$('a.mix-again').click(function() {
|
||||
var $link = $(this);
|
||||
restAdmin.tryMixAgain({mix_id: $link.attr('data-mix-id')})
|
||||
.done(function(response) {
|
||||
$link.closest('div.mix-again').find('div.mix-again-dialog').html('<div>Mix enqueued</div><a href="' + gon.global.prefix + 'resque">Resque Web</a>').dialog();
|
||||
})
|
||||
.error(function(jqXHR) {
|
||||
$link.closest('div.mix-again').find('div.mix-again-dialog').html('Mix failed: ' + jqXHR.responseText).dialog();
|
||||
})
|
||||
|
||||
return false;
|
||||
})
|
||||
|
||||
});
|
||||
})(window, jQuery);
|
||||
|
|
@ -7,6 +7,9 @@
|
|||
// For example, to change the sidebar width:
|
||||
// $sidebar-width: 242px;
|
||||
|
||||
/*
|
||||
*= require jquery.ui.all
|
||||
*/
|
||||
// Active Admin's got SASS!
|
||||
@import "active_admin/mixins";
|
||||
@import "active_admin/base";
|
||||
|
|
|
|||
|
|
@ -9,5 +9,6 @@
|
|||
* compiled file, but it's generally better to create a new file per style scope.
|
||||
*
|
||||
*= require_self
|
||||
*= require jquery.ui.all
|
||||
*= require_tree .
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
.version-info {
|
||||
font-size:small;
|
||||
color:lightgray;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
class ApplicationController < ActionController::Base
|
||||
protect_from_forgery
|
||||
|
||||
before_filter :prepare_gon
|
||||
|
||||
def prepare_gon
|
||||
gon.another = 'hello'
|
||||
gon.prefix = ENV['RAILS_RELATIVE_URL_ROOT'] || '/'
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -80,14 +80,16 @@ module JamAdmin
|
|||
config.storage_type = :fog
|
||||
|
||||
# these only need to be set if store_artifact_to_files = false
|
||||
config.aws_artifact_access_key_id = ENV['AWS_KEY']
|
||||
config.aws_artifact_secret_access_key = ENV['AWS_SECRET']
|
||||
config.aws_artifact_region = 'us-east-1'
|
||||
config.aws_artifact_bucket_public = 'jamkazam-dev-public'
|
||||
config.aws_artifact_bucket = 'jamkazam-dev'
|
||||
config.aws_artifact_cache = '315576000'
|
||||
config.aws_access_key_id = ENV['AWS_KEY']
|
||||
config.aws_secret_access_key = ENV['AWS_SECRET']
|
||||
config.aws_region = 'us-east-1'
|
||||
config.aws_bucket_public = 'jamkazam-dev-public'
|
||||
config.aws_bucket = 'jamkazam-dev'
|
||||
config.aws_cache = '315576000'
|
||||
|
||||
# for carrierwave_direct
|
||||
config.action_controller.allow_forgery_protection = false
|
||||
|
||||
config.redis_host = "localhost:6379"
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
# Load the rails application
|
||||
require File.expand_path('../application', __FILE__)
|
||||
|
||||
APP_CONFIG = Rails.application.config
|
||||
|
||||
# Initialize the rails application
|
||||
JamAdmin::Application.initialize!
|
||||
|
|
|
|||
|
|
@ -71,6 +71,6 @@ JamAdmin::Application.configure do
|
|||
# Show the logging configuration on STDOUT
|
||||
config.show_log_configuration = false
|
||||
|
||||
config.aws_artifact_bucket_public = 'jamkazam-public'
|
||||
config.aws_artifact_bucket = 'jamkazam'
|
||||
config.aws_bucket_public = 'jamkazam-public'
|
||||
config.aws_bucket = 'jamkazam'
|
||||
end
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ class Footer < ActiveAdmin::Component
|
|||
def build
|
||||
super(id: "footer")
|
||||
para "version info: web=#{::JamAdmin::VERSION} lib=#{JamRuby::VERSION} db=#{JamDb::VERSION}"
|
||||
render :inline => include_gon
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ CarrierWave.configure do |config|
|
|||
config.storage = :fog
|
||||
config.fog_credentials = {
|
||||
:provider => 'AWS',
|
||||
:aws_access_key_id => JamAdmin::Application.config.aws_artifact_access_key_id,
|
||||
:aws_secret_access_key => JamAdmin::Application.config.aws_artifact_secret_access_key,
|
||||
:region => JamAdmin::Application.config.aws_artifact_region,
|
||||
:aws_access_key_id => JamAdmin::Application.config.aws_access_key_id,
|
||||
:aws_secret_access_key => JamAdmin::Application.config.aws_secret_access_key,
|
||||
:region => JamAdmin::Application.config.aws_region,
|
||||
}
|
||||
config.fog_directory = JamAdmin::Application.config.aws_artifact_bucket_public # required
|
||||
config.fog_directory = JamAdmin::Application.config.aws_bucket_public # required
|
||||
config.fog_public = true # optional, defaults to true
|
||||
config.fog_attributes = {'Cache-Control'=>"max-age=#{JamAdmin::Application.config.aws_artifact_cache}"} # optional, defaults to {}
|
||||
config.fog_attributes = {'Cache-Control'=>"max-age=#{JamAdmin::Application.config.aws_cache}"} # optional, defaults to {}
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Gon.global.prefix = ENV['RAILS_RELATIVE_URL_ROOT'] || '/'
|
||||
|
|
@ -0,0 +1 @@
|
|||
Resque.redis = Rails.application.config.redis_host
|
||||
|
|
@ -15,6 +15,7 @@ JamAdmin::Application.routes.draw do
|
|||
ActiveAdmin.routes(self)
|
||||
|
||||
match '/api/artifacts' => 'artifacts#update_artifacts', :via => :post
|
||||
match '/api/mix/:id/enqueue' => 'admin/mixes#mix_again', :via => :post
|
||||
|
||||
mount Resque::Server.new, :at => "/resque"
|
||||
|
||||
|
|
|
|||
|
|
@ -87,4 +87,5 @@ discardable_recorded_tracks2.sql
|
|||
icecast.sql
|
||||
home_page_promos.sql
|
||||
mix_job_watch.sql
|
||||
music_session_constraints.sql
|
||||
music_session_constraints.sql
|
||||
mixes_drop_manifest_add_retry.sql
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
ALTER TABLE mixes DROP COLUMN manifest;
|
||||
ALTER TABLE mixes ADD COLUMN should_retry BOOLEAN NOT NULL DEFAULT FALSE;
|
||||
|
|
@ -29,6 +29,7 @@ require "jam_ruby/lib/s3_util"
|
|||
require "jam_ruby/lib/s3_manager"
|
||||
require "jam_ruby/lib/profanity"
|
||||
require "jam_ruby/resque/audiomixer"
|
||||
require "jam_ruby/resque/scheduled/audiomixer_retry"
|
||||
require "jam_ruby/mq_router"
|
||||
require "jam_ruby/base_manager"
|
||||
require "jam_ruby/connection_manager"
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ module JamRuby
|
|||
self.primary_key = 'id'
|
||||
belongs_to :recording, :class_name => "JamRuby::Recording", :inverse_of => :mixes
|
||||
|
||||
def self.schedule(recording, manifest)
|
||||
|
||||
|
||||
def self.schedule(recording)
|
||||
raise if recording.nil?
|
||||
raise if manifest.nil?
|
||||
|
||||
mix = Mix.new
|
||||
mix.recording = recording
|
||||
mix.manifest = manifest.to_json
|
||||
mix.save
|
||||
mix.url = construct_filename(mix.created_at, recording.id, mix.id)
|
||||
if mix.save
|
||||
|
|
@ -26,7 +26,16 @@ module JamRuby
|
|||
end
|
||||
|
||||
def enqueue
|
||||
Resque.enqueue(AudioMixer, self.id, self.sign_put)
|
||||
begin
|
||||
Resque.enqueue(AudioMixer, self.id, self.sign_put)
|
||||
rescue
|
||||
# implies redis is down. we don't update started_at
|
||||
false
|
||||
end
|
||||
|
||||
Mix.where(:id => self.id).update_all(:started_at => Time.now)
|
||||
|
||||
true
|
||||
end
|
||||
|
||||
def can_download?(some_user)
|
||||
|
|
@ -53,6 +62,23 @@ module JamRuby
|
|||
end
|
||||
end
|
||||
|
||||
# valid for 1 day; because the s3 urls eventually expire
|
||||
def manifest
|
||||
one_day = 60 * 60 * 24
|
||||
|
||||
manifest = { "files" => [], "timeline" => [] }
|
||||
mix_params = []
|
||||
recording.recorded_tracks.each do |recorded_track|
|
||||
manifest["files"] << { "filename" => recorded_track.sign_url(one_day), "codec" => "vorbis", "offset" => 0 }
|
||||
mix_params << { "level" => 100, "balance" => 0 }
|
||||
end
|
||||
|
||||
manifest["timeline"] << { "timestamp" => 0, "mix" => mix_params }
|
||||
manifest["output"] = { "codec" => "vorbis" }
|
||||
manifest["recording_id"] = self.id
|
||||
manifest
|
||||
end
|
||||
|
||||
def s3_url
|
||||
s3_manager.s3_url(url)
|
||||
end
|
||||
|
|
@ -70,6 +96,12 @@ module JamRuby
|
|||
s3_manager.sign_url(self.url, {:expires => expiration_time, :content_type => 'audio/ogg', :secure => false}, :put)
|
||||
end
|
||||
|
||||
def self.queue_jobs_needing_retry
|
||||
Mix.find_each(:conditions => 'should_retry = TRUE or started_at is NULL', :batch_size => 100) do |mix|
|
||||
mix.enqueue
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def delete_s3_files
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ module JamRuby
|
|||
return unless recorded_track.fully_uploaded
|
||||
end
|
||||
|
||||
self.mixes << Mix.schedule(self, base_mix_manifest)
|
||||
self.mixes << Mix.schedule(self)
|
||||
|
||||
save
|
||||
end
|
||||
|
|
@ -310,21 +310,6 @@ module JamRuby
|
|||
end
|
||||
=end
|
||||
|
||||
def base_mix_manifest
|
||||
manifest = { "files" => [], "timeline" => [] }
|
||||
mix_params = []
|
||||
recorded_tracks.each do |recorded_track|
|
||||
return nil unless recorded_track.fully_uploaded
|
||||
manifest["files"] << { "filename" => recorded_track.sign_url(60 * 60 * 24), "codec" => "vorbis", "offset" => 0 }
|
||||
mix_params << { "level" => 100, "balance" => 0 }
|
||||
end
|
||||
|
||||
manifest["timeline"] << { "timestamp" => 0, "mix" => mix_params }
|
||||
manifest["output"] = { "codec" => "vorbis" }
|
||||
manifest["recording_id"] = self.id
|
||||
manifest
|
||||
end
|
||||
|
||||
private
|
||||
def self.validate_user_is_band_member(user, band)
|
||||
unless band.users.exists? user
|
||||
|
|
|
|||
|
|
@ -6,12 +6,11 @@ require 'digest/md5'
|
|||
|
||||
module JamRuby
|
||||
|
||||
# executes a mix of tracks, creating a final output mix
|
||||
class AudioMixer
|
||||
|
||||
@queue = :audiomixer
|
||||
|
||||
#extend Resque::Plugins::Retry
|
||||
|
||||
@@log = Logging.logger[AudioMixer]
|
||||
|
||||
attr_accessor :mix_id, :manifest, :manifest_file, :output_filename, :error_out_filename, :postback_output_url,
|
||||
|
|
@ -210,7 +209,7 @@ module JamRuby
|
|||
return
|
||||
end
|
||||
|
||||
@manifest = symbolize_keys(JSON.parse(mix.manifest))
|
||||
@manifest = symbolize_keys(mix.manifest)
|
||||
@manifest[:mix_id] = mix_id # slip in the mix_id so that the job can add it to the ogg comments
|
||||
|
||||
# sanity check the manifest
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
require 'json'
|
||||
require 'resque'
|
||||
require 'resque-retry'
|
||||
require 'net/http'
|
||||
require 'digest/md5'
|
||||
|
||||
module JamRuby
|
||||
|
||||
# periodically scheduled to find jobs that need retrying
|
||||
class AudioMixerRetry
|
||||
|
||||
@queue = :audiomixer_retry
|
||||
|
||||
@@log = Logging.logger[AudioMixerRetry]
|
||||
|
||||
def self.perform
|
||||
Mix.queue_jobs_needing_retry
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -14,27 +14,17 @@ describe Mix do
|
|||
@recording.stop
|
||||
@recording.claim(@user, "name", "description", Genre.first, true, true)
|
||||
@recording.errors.any?.should be_false
|
||||
@mix = Mix.schedule(@recording, {})
|
||||
@mix = Mix.schedule(@recording)
|
||||
@mix.reload
|
||||
end
|
||||
|
||||
it "should create a mix for a user's recording properly" do
|
||||
@mix.recording_id.should == @recording.id
|
||||
@mix.manifest.should == {}.to_json
|
||||
@mix.mix_server.should be_nil
|
||||
@mix.started_at.should be_nil
|
||||
@mix.started_at.should_not be_nil
|
||||
@mix.completed_at.should be_nil
|
||||
end
|
||||
|
||||
it "should fail to create a mix if the userid doesn't own the recording" do
|
||||
@user2 = FactoryGirl.create(:user)
|
||||
expect { Mix.schedule(@recording) }.to raise_error
|
||||
end
|
||||
|
||||
it "should fail if the recording doesn't exist" do
|
||||
expect { @mix2 = Mix.schedule(Recording.find('lskdjflsd')) }.to raise_error
|
||||
end
|
||||
|
||||
it "should record when a mix has finished" do
|
||||
Mix.find(@mix.id).finish(10000, "md5hash")
|
||||
@mix.reload
|
||||
|
|
|
|||
|
|
@ -175,13 +175,15 @@ describe AudioMixer do
|
|||
AudioMixer.any_instance.stub(:postback) # don't actually post resulting off file up
|
||||
end
|
||||
|
||||
|
||||
describe "perform" do
|
||||
|
||||
# this case does not talk to redis, does not run the real audiomixer, and does not actually talk with s3
|
||||
# but it does talk to the database and verifies all the other logic
|
||||
it "success" do
|
||||
@mix = Mix.schedule(@recording, local_files_manifest)
|
||||
Mix.any_instance.stub(:manifest).and_return(local_files_manifest) # don't actually post resulting off file up
|
||||
@mix = Mix.schedule(@recording)
|
||||
@mix.reload
|
||||
@mix.started_at.should_not be_nil
|
||||
AudioMixer.perform(@mix.id, @mix.sign_url(60 * 60 * 24))
|
||||
@mix.reload
|
||||
@mix.completed.should be_true
|
||||
|
|
@ -191,7 +193,8 @@ describe AudioMixer do
|
|||
|
||||
it "errored" do
|
||||
local_files_manifest[:files][0][:filename] = '/some/path/to/nowhere'
|
||||
@mix = Mix.schedule(@recording, local_files_manifest)
|
||||
Mix.any_instance.stub(:manifest).and_return(local_files_manifest)
|
||||
@mix = Mix.schedule(@recording)
|
||||
expect{ AudioMixer.perform(@mix.id, @mix.sign_url(60 * 60 * 24)) }.to raise_error
|
||||
@mix.reload
|
||||
@mix.completed.should be_false
|
||||
|
|
@ -208,13 +211,15 @@ describe AudioMixer do
|
|||
end
|
||||
|
||||
it "should have been enqueued because mix got scheduled" do
|
||||
@mix = Mix.schedule(@recording, local_files_manifest)
|
||||
Mix.any_instance.stub(:manifest).and_return(local_files_manifest)
|
||||
@mix = Mix.schedule(@recording)
|
||||
AudioMixer.should have_queue_size_of(1)
|
||||
end
|
||||
|
||||
it "should actually run the job" do
|
||||
with_resque do
|
||||
@mix = Mix.schedule(@recording, local_files_manifest)
|
||||
Mix.any_instance.stub(:manifest).and_return(local_files_manifest)
|
||||
@mix = Mix.schedule(@recording)
|
||||
end
|
||||
|
||||
@mix.reload
|
||||
|
|
@ -225,7 +230,8 @@ describe AudioMixer do
|
|||
|
||||
it "bails out with no error if already completed" do
|
||||
with_resque do
|
||||
@mix = Mix.schedule(@recording, local_files_manifest)
|
||||
Mix.any_instance.stub(:manifest).and_return(local_files_manifest)
|
||||
@mix = Mix.schedule(@recording)
|
||||
end
|
||||
|
||||
@mix.reload
|
||||
|
|
@ -274,7 +280,8 @@ describe AudioMixer do
|
|||
|
||||
it "completes" do
|
||||
with_resque do
|
||||
@mix = Mix.schedule(@recording, s3_manifest)
|
||||
Mix.any_instance.stub(:manifest).and_return(s3_manifest)
|
||||
@mix = Mix.schedule(@recording)
|
||||
end
|
||||
|
||||
@mix.reload
|
||||
|
|
@ -286,7 +293,8 @@ describe AudioMixer do
|
|||
it "fails" do
|
||||
with_resque do
|
||||
s3_manifest[:files][0][:filename] = @s3_manager.url('audiomixer/bogus.ogg', :secure => false) # take off some of the trailing chars of the url
|
||||
expect{ Mix.schedule(@recording, s3_manifest) }.to raise_error
|
||||
Mix.any_instance.stub(:manifest).and_return(s3_manifest)
|
||||
expect{ Mix.schedule(@recording) }.to raise_error
|
||||
end
|
||||
|
||||
@mix = Mix.order('id desc').limit(1).first()
|
||||
|
|
|
|||
|
|
@ -10,14 +10,6 @@ class ApiMixesController < ApiController
|
|||
|
||||
respond_to :json
|
||||
|
||||
def schedule
|
||||
begin
|
||||
Mix.schedule(params[:recording_id], current_user, params[:description], params[:manifest])
|
||||
respond_with responder: ApiResponder, :status => 204
|
||||
rescue
|
||||
render :json => { :message => "mix could not be scheduled" }, :status => 403
|
||||
end
|
||||
end
|
||||
|
||||
def next
|
||||
begin
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
rails_env = ENV['RAILS_ENV'] || "production"
|
||||
rails_root = ENV['RAILS_ROOT'] || "/data/github/current"
|
||||
num_workers = rails_env == 'production' ? 5 : 2
|
||||
rails_root = ENV['RAILS_ROOT'] || '.'
|
||||
rails_env = ENV['RAILS_ENV'] || "development"
|
||||
num_workers = ENV['NUM_WORKERS'] || 2
|
||||
queues = ENV['QUEUE'] || '*'
|
||||
|
||||
num_workers.times do |num|
|
||||
God.watch do |w|
|
||||
|
|
@ -8,11 +9,11 @@ num_workers.times do |num|
|
|||
w.name = "resque-#{num}"
|
||||
w.group = 'resque'
|
||||
w.interval = 30.seconds
|
||||
w.env = {"QUEUE"=>"critical,high,low", "RAILS_ENV"=>rails_env}
|
||||
w.start = "/usr/bin/rake -f #{rails_root}/Rakefile environment resque:work"
|
||||
w.env = {"QUEUE"=>queues, "RAILS_ENV"=>rails_env}
|
||||
w.start = "/usr/local/bin/bundle exec rake environment resque:work"
|
||||
|
||||
w.uid = 'git'
|
||||
w.gid = 'git'
|
||||
#w.uid = 'jam-resque'
|
||||
#w.gid = 'jam-resque'
|
||||
|
||||
# restart if memory gets too high
|
||||
w.transition(:up, :restart) do |on|
|
||||
|
|
@ -296,8 +296,6 @@ SampleApp::Application.routes.draw do
|
|||
match '/claimed_recordings/:id' => 'api_claimed_recordings#update', :via => :put
|
||||
match '/claimed_recordings/:id' => 'api_claimed_recordings#delete', :via => :delete
|
||||
|
||||
# Mixes
|
||||
match '/mixes/schedule' => 'api_mixes#schedule', :via => :post
|
||||
match '/mixes/next' => 'api_mixes#next', :via => :get
|
||||
match '/mixes/:id/finish' => 'api_mixes#finish', :via => :put
|
||||
match '/mixes/:id/download' => 'api_mixes#download', :via => :get
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
# add job scheduler classes here
|
||||
AudioMixerRetry:
|
||||
cron: 0 * * * *
|
||||
class: "JamRuby::AudioMixerRetry"
|
||||
description: "Retries mixes that set the should_retry flag or never started"
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
# Resque tasks
|
||||
require 'resque/tasks'
|
||||
require 'resque_scheduler/tasks'
|
||||
require 'resque'
|
||||
require 'resque_scheduler'
|
||||
|
||||
task :scheduler => :environment do
|
||||
|
||||
# If you want to be able to dynamically change the schedule,
|
||||
# uncomment this line. A dynamic schedule can be updated via the
|
||||
# Resque::Scheduler.set_schedule (and remove_schedule) methods.
|
||||
# When dynamic is set to true, the scheduler process looks for
|
||||
# schedule changes and applies them on the fly.
|
||||
# Note: This feature is only available in >=2.0.0.
|
||||
#Resque::Scheduler.dynamic = true
|
||||
|
||||
# The schedule doesn't need to be stored in a YAML, it just needs to
|
||||
# be a hash. YAML is usually the easiest.
|
||||
Resque.schedule = YAML.load_file(File.join(File.dirname(__FILE__), '../..', 'config/scheduler.yml'))
|
||||
|
||||
# If your schedule already has +queue+ set for each job, you don't
|
||||
# need to require your jobs. This can be an advantage since it's
|
||||
# less code that resque-scheduler needs to know about. But in a small
|
||||
# project, it's usually easier to just include you job classes here.
|
||||
# So, something like this:
|
||||
#require 'jobs'
|
||||
|
||||
Rake::Task['resque:scheduler'].invoke
|
||||
end
|
||||
|
|
@ -2,10 +2,6 @@
|
|||
|
||||
# bundle exec rake audiomixer
|
||||
task :audiomixer do
|
||||
|
||||
|
||||
Rails.application.config.websocket_gateway_enable = false # prevent websocket gateway from starting
|
||||
|
||||
Rake::Task['environment'].invoke
|
||||
|
||||
ENV['QUEUE'] = 'audiomixer'
|
||||
|
|
|
|||
|
|
@ -145,6 +145,7 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
|
|||
end
|
||||
|
||||
it "claim recording with unique names/descriptions" do
|
||||
pending "intermittent failure on build server, hard to repro on local system"
|
||||
@users.each do |user|
|
||||
name = "#{user.name}'s recording"
|
||||
desc = "#{user.name}'s description"
|
||||
|
|
@ -177,6 +178,7 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature
|
|||
end
|
||||
|
||||
it "a 'Description' is optional" do
|
||||
pending "intermittent failure on build server, hard to repro on local system"
|
||||
@users.each do |user|
|
||||
in_client(user) do
|
||||
claim_recording("my recording", '')
|
||||
|
|
|
|||
Loading…
Reference in New Issue