diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-23 13:29:13 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-23 13:29:13 +0400 |
commit | 923eb89c1de137e8daeb871e63530070aa70379e (patch) | |
tree | b7013f7a811d9905ea66feb99d6b417083eebdb1 | |
parent | ad3eefdcb8cf08007c45876afea20109b5984876 (diff) | |
parent | 6ddbee5d89b3ea0e5d2a8f2b72416dcb7ab39fe5 (diff) |
Merge pull request #1528 from tsigo/resque_init
Consolidate Resque-related initializers
-rw-r--r-- | config/initializers/4_resque.rb | 31 | ||||
-rw-r--r-- | config/initializers/4_resque_queues.rb | 1 | ||||
-rw-r--r-- | config/initializers/resque.rb | 8 | ||||
-rw-r--r-- | config/initializers/resque_authentication.rb | 14 | ||||
-rw-r--r-- | config/initializers/resque_mailer.rb | 1 |
5 files changed, 31 insertions, 24 deletions
diff --git a/config/initializers/4_resque.rb b/config/initializers/4_resque.rb new file mode 100644 index 00000000000..2a5721ec742 --- /dev/null +++ b/config/initializers/4_resque.rb @@ -0,0 +1,31 @@ +# Custom Redis configuration +rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..' +rails_env = ENV['RAILS_ENV'] || 'development' +config_file = File.join(rails_root, 'config', 'resque.yml') + +if File.exists?(config_file) + resque_config = YAML.load_file(config_file) + Resque.redis = resque_config[rails_env] +end + +# Queues +Resque.watch_queue(PostReceive.instance_variable_get("@queue")) + +# Authentication +require 'resque/server' +class Authentication + def initialize(app) + @app = app + end + + def call(env) + account = env['warden'].authenticate!(:database_authenticatable, :rememberable, scope: :user) + raise "Access denied" if !account.admin? + @app.call(env) + end +end + +Resque::Server.use Authentication + +# Mailer +Resque::Mailer.excluded_environments = [] diff --git a/config/initializers/4_resque_queues.rb b/config/initializers/4_resque_queues.rb deleted file mode 100644 index 5b0087ab025..00000000000 --- a/config/initializers/4_resque_queues.rb +++ /dev/null @@ -1 +0,0 @@ -Resque.watch_queue(PostReceive.instance_variable_get("@queue")) diff --git a/config/initializers/resque.rb b/config/initializers/resque.rb deleted file mode 100644 index b333ceeea1a..00000000000 --- a/config/initializers/resque.rb +++ /dev/null @@ -1,8 +0,0 @@ -rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..' -rails_env = ENV['RAILS_ENV'] || 'development' -config_file = File.join(rails_root, 'config', 'resque.yml') - -if File.exists?(config_file) - resque_config = YAML.load_file(config_file) - Resque.redis = resque_config[rails_env] -end diff --git a/config/initializers/resque_authentication.rb b/config/initializers/resque_authentication.rb deleted file mode 100644 index a439d322804..00000000000 --- a/config/initializers/resque_authentication.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'resque/server' -class Authentication - def initialize(app) - @app = app - end - - def call(env) - account = env['warden'].authenticate!(:database_authenticatable, :rememberable, scope: :user) - raise "Access denied" if !account.admin? - @app.call(env) - end -end - -Resque::Server.use Authentication
\ No newline at end of file diff --git a/config/initializers/resque_mailer.rb b/config/initializers/resque_mailer.rb deleted file mode 100644 index cec9dec9d0e..00000000000 --- a/config/initializers/resque_mailer.rb +++ /dev/null @@ -1 +0,0 @@ -Resque::Mailer.excluded_environments = [] |