From 436ec039c8a832639cf0aa531f92cc0f38ba3ce1 Mon Sep 17 00:00:00 2001 From: Jonas Lundqvist Date: Fri, 4 May 2012 19:56:34 +0200 Subject: [PATCH 1/4] remove debug_rjs reference --- config/environments/integration2.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/config/environments/integration2.rb b/config/environments/integration2.rb index d5630d80d..8b4b88521 100644 --- a/config/environments/integration2.rb +++ b/config/environments/integration2.rb @@ -15,7 +15,6 @@ Diaspora::Application.configure do # Show full error reports and disable caching config.consider_all_requests_local = true - config.action_view.debug_rjs = true config.action_controller.perform_caching = false # Don't care if the mailer can't send From 819bb95dbdabd8baecfacb0939a970e3d43453d0 Mon Sep 17 00:00:00 2001 From: Jonas Lundqvist Date: Sun, 6 May 2012 22:04:33 +0200 Subject: [PATCH 2/4] reorder so integration2 connects to correct redis port --- config/initializers/resque.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/resque.rb b/config/initializers/resque.rb index e4c2b302c..aafd6793c 100644 --- a/config/initializers/resque.rb +++ b/config/initializers/resque.rb @@ -6,10 +6,10 @@ if !AppConfig.single_process_mode? if redis_to_go = ENV["REDISTOGO_URL"] uri = URI.parse(redis_to_go) 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' Resque.redis = Redis.new(:host => 'localhost', :port => 6380) + elsif AppConfig[:redis_url] + Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379) end end From 501c4aa31e924ab97183c03705ad00cfc6e35503 Mon Sep 17 00:00:00 2001 From: Jonas Lundqvist Date: Sun, 6 May 2012 22:06:11 +0200 Subject: [PATCH 3/4] seperate and move redis dump files so they don't mess with installed redis --- redis-integration1.conf | 4 ++-- redis-integration2.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/redis-integration1.conf b/redis-integration1.conf index 0c4d919eb..877925868 100644 --- a/redis-integration1.conf +++ b/redis-integration1.conf @@ -94,7 +94,7 @@ save 60 10000 rdbcompression yes # The filename where to dump the DB -dbfilename dump.rdb +dbfilename dump_integration1.rdb # The working directory. # @@ -104,7 +104,7 @@ dbfilename dump.rdb # Also the Append Only File will be created inside this directory. # # Note that you must specify a directory here, not a file name. -dir /usr/local/var/db/redis/ +dir tmp/ ################################# REPLICATION ################################# diff --git a/redis-integration2.conf b/redis-integration2.conf index ff4ab145b..bb16fed8d 100644 --- a/redis-integration2.conf +++ b/redis-integration2.conf @@ -94,7 +94,7 @@ save 60 10000 rdbcompression yes # The filename where to dump the DB -dbfilename dump.rdb +dbfilename dump_integration2.rdb # The working directory. # @@ -104,7 +104,7 @@ dbfilename dump.rdb # Also the Append Only File will be created inside this directory. # # Note that you must specify a directory here, not a file name. -dir /usr/local/var/db/redis/ +dir tmp/ ################################# REPLICATION ################################# From 324663e4b47d2cc3f16a2e555673f2923f8f0700 Mon Sep 17 00:00:00 2001 From: Jonas Lundqvist Date: Tue, 8 May 2012 11:01:10 +0200 Subject: [PATCH 4/4] match integration pod ports --- config/application.yml.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/application.yml.example b/config/application.yml.example index 9cf9b9a01..c25debe2c 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -251,10 +251,10 @@ test: integration1: <<: *defaults - pod_url: "http://localhost:45789/" + pod_url: "http://localhost:3001/" serve_static_assets: true integration2: <<: *defaults - pod_url: "http://localhost:34658/" + pod_url: "http://localhost:3002/" serve_static_assets: true \ No newline at end of file