nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3240 from pubis/update-federation-logger

Browse source 
Update federation logger
This commit is contained in:
Maxwell Salzberg 2012-05-08 10:01:00 -07:00
commit 3a6f32e2d7
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/application.yml.example
View file

@ -251,10 +251,10 @@ test:
integration1: integration1:
<<: *defaults <<: *defaults
pod_url: "http://localhost:45789/" pod_url: "http://localhost:3001/"
serve_static_assets: true serve_static_assets: true
integration2: integration2:
<<: *defaults <<: *defaults
pod_url: "http://localhost:34658/" pod_url: "http://localhost:3002/"
serve_static_assets: true serve_static_assets: true

1
config/environments/integration2.rb
View file

@ -15,7 +15,6 @@ Diaspora::Application.configure do
# Show full error reports and disable caching # Show full error reports and disable caching
config.consider_all_requests_local = true config.consider_all_requests_local = true
config.action_view.debug_rjs = true
config.action_controller.perform_caching = false config.action_controller.perform_caching = false
# Don't care if the mailer can't send # Don't care if the mailer can't send

4
config/initializers/resque.rb
View file

@ -6,10 +6,10 @@ if !AppConfig.single_process_mode?
if redis_to_go = ENV["REDISTOGO_URL"] if redis_to_go = ENV["REDISTOGO_URL"]
uri = URI.parse(redis_to_go) uri = URI.parse(redis_to_go)
Resque.redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password) Resque.redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
elsif AppConfig[:redis_url]
Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379)
elsif ENV['RAILS_ENV']== 'integration2' elsif ENV['RAILS_ENV']== 'integration2'
Resque.redis = Redis.new(:host => 'localhost', :port => 6380) Resque.redis = Redis.new(:host => 'localhost', :port => 6380)
elsif AppConfig[:redis_url]
Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379)
end end
end end

4
redis-integration1.conf
View file

@ -94,7 +94,7 @@ save 60 10000
rdbcompression yes rdbcompression yes
# The filename where to dump the DB # The filename where to dump the DB
dbfilename dump.rdb dbfilename dump_integration1.rdb
# The working directory. # The working directory.
# #
@ -104,7 +104,7 @@ dbfilename dump.rdb
# Also the Append Only File will be created inside this directory. # Also the Append Only File will be created inside this directory.
# #
# Note that you must specify a directory here, not a file name. # Note that you must specify a directory here, not a file name.
dir /usr/local/var/db/redis/ dir tmp/
################################# REPLICATION ################################# ################################# REPLICATION #################################

4
redis-integration2.conf
View file

@ -94,7 +94,7 @@ save 60 10000
rdbcompression yes rdbcompression yes
# The filename where to dump the DB # The filename where to dump the DB
dbfilename dump.rdb dbfilename dump_integration2.rdb
# The working directory. # The working directory.
# #
@ -104,7 +104,7 @@ dbfilename dump.rdb
# Also the Append Only File will be created inside this directory. # Also the Append Only File will be created inside this directory.
# #
# Note that you must specify a directory here, not a file name. # Note that you must specify a directory here, not a file name.
dir /usr/local/var/db/redis/ dir tmp/
################################# REPLICATION ################################# ################################# REPLICATION #################################