diff --git a/ruby/lib/jam_ruby/resque/scheduled/icecast_source_check.rb b/ruby/lib/jam_ruby/resque/scheduled/icecast_source_check.rb index d832f4d2d..d17320cb4 100644 --- a/ruby/lib/jam_ruby/resque/scheduled/icecast_source_check.rb +++ b/ruby/lib/jam_ruby/resque/scheduled/icecast_source_check.rb @@ -11,13 +11,10 @@ module JamRuby class IcecastSourceCheck extend Resque::Plugins::LonelyJob - @queue = :icecast_source_check - @@log = Logging.logger[IcecastSourceCheck] - def self.perform @@log.debug("waking up") diff --git a/web/config/initializers/resque.rb b/web/config/initializers/resque.rb index 5c3c402fc..5077fea0f 100644 --- a/web/config/initializers/resque.rb +++ b/web/config/initializers/resque.rb @@ -1 +1,13 @@ -Resque.redis = Rails.application.config.redis_host \ No newline at end of file +Resque.redis = Rails.application.config.redis_host + + +if !$rails_rake_task && Rails.env == 'development' && ENV['RUN_JOBS_INLINE'] == '1' + + Thread.new do + system('INTERVAL=1 bundle exec rake all_jobs') + end + + Thread.new do + system('bundle exec rake scheduler') + end +end \ No newline at end of file diff --git a/web/config/routes.rb b/web/config/routes.rb index dc7a1cfcd..1a77090a3 100644 --- a/web/config/routes.rb +++ b/web/config/routes.rb @@ -71,6 +71,14 @@ SampleApp::Application.routes.draw do # email update match '/confirm_email' => 'users#finalize_update_email', :as => 'confirm_email' # NOTE: if you change this, you break outstanding email changes because links in user inboxes are broken + # embed resque-web if this is development mode + if Rails.env == "development" + require 'resque/server' + require 'resque-retry' + require 'resque-retry/server' + mount Resque::Server.new, :at => "/resque" if Rails.env == "development" + end + scope '/corp' do match '/about', to: 'corps#about', as: 'corp_about' match '/contact', to: 'corps#contact', as: 'corp_contact' @@ -324,4 +332,5 @@ SampleApp::Application.routes.draw do match '/icecast/listener_add' => 'api_icecast#listener_add', :via => :post match '/icecast/listener_remove' => 'api_icecast#listener_remove', :via => :post end + end