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

Update federation logger

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

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

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
 

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 #################################
 

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 #################################