Commit 3c1022f9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

No resque errors

parent 64db738f
...@@ -77,7 +77,7 @@ gem "acts-as-taggable-on", "2.3.3" ...@@ -77,7 +77,7 @@ gem "acts-as-taggable-on", "2.3.3"
gem "draper", "~> 0.18.0" gem "draper", "~> 0.18.0"
# Background jobs # Background jobs
gem "resque", "~> 1.23.0" gem "resque", git: "https://github.com/defunkt/resque.git", ref: "9ef4700306dd946a3ac000612428967ce0c32213"
gem 'resque_mailer' gem 'resque_mailer'
# HTTP requests # HTTP requests
......
...@@ -13,6 +13,17 @@ GIT ...@@ -13,6 +13,17 @@ GIT
activerecord (>= 2.3.0) activerecord (>= 2.3.0)
rake (>= 0.8.7) rake (>= 0.8.7)
GIT
remote: https://github.com/defunkt/resque.git
revision: 9ef4700306dd946a3ac000612428967ce0c32213
ref: 9ef4700306dd946a3ac000612428967ce0c32213
specs:
resque (2.0.0.pre.1)
json
redis-namespace (~> 1.0)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
GIT GIT
remote: https://github.com/gitlabhq/grack.git remote: https://github.com/gitlabhq/grack.git
revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8 revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
...@@ -315,7 +326,7 @@ GEM ...@@ -315,7 +326,7 @@ GEM
rack (>= 1.1.3) rack (>= 1.1.3)
rack-mount (0.8.3) rack-mount (0.8.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-protection (1.2.0) rack-protection (1.3.2)
rack rack
rack-ssl (1.3.2) rack-ssl (1.3.2)
rack rack
...@@ -351,11 +362,6 @@ GEM ...@@ -351,11 +362,6 @@ GEM
redis (3.0.2) redis (3.0.2)
redis-namespace (1.2.1) redis-namespace (1.2.1)
redis (~> 3.0.0) redis (~> 3.0.0)
resque (1.23.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
resque_mailer (2.1.0) resque_mailer (2.1.0)
actionmailer (~> 3.0) actionmailer (~> 3.0)
resque_spec (0.12.5) resque_spec (0.12.5)
...@@ -512,7 +518,7 @@ DEPENDENCIES ...@@ -512,7 +518,7 @@ DEPENDENCIES
rb-fsevent rb-fsevent
rb-inotify rb-inotify
redcarpet (~> 2.2.2) redcarpet (~> 2.2.2)
resque (~> 1.23.0) resque!
resque_mailer resque_mailer
resque_spec resque_spec
rspec-rails rspec-rails
......
...@@ -6,12 +6,11 @@ if File.exists?(config_file) ...@@ -6,12 +6,11 @@ if File.exists?(config_file)
Resque.redis = resque_config[Rails.env] Resque.redis = resque_config[Rails.env]
end end
Resque.redis.namespace = 'resque:gitlab' Resque.redis.namespace = 'resque:gitlab'
# Queues Resque.before_fork = Proc.new { ActiveRecord::Base.establish_connection }
Resque.watch_queue(PostReceive.instance_variable_get("@queue"))
# Authentication # Authentication
require 'resque/server' require 'resque/server'
class Authentication class ResqueAuthentication
def initialize(app) def initialize(app)
@app = app @app = app
end end
...@@ -23,9 +22,8 @@ class Authentication ...@@ -23,9 +22,8 @@ class Authentication
end end
end end
Resque::Server.use Authentication Resque::Server.use ResqueAuthentication
# Mailer # Mailer
Resque::Mailer.excluded_environments = [] Resque::Mailer.excluded_environments = []
Resque.before_fork = Proc.new { ActiveRecord::Base.establish_connection }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment