Less noise from logs

just3ws · just3ws · commit 9dd91218bdc5 · 2014-11-04T14:44:58.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,5 @@ vcr_cassettes
 dump
 BACKUP
 Guardfile
+verification.log
+npm-debug.log
diff --git a/Rakefile b/Rakefile
@@ -5,7 +5,6 @@ Coderwall::Application.load_tasks
 
 task default: :spec
 
-
 namespace :team do
   task migrate: :environment do
     puts '--- Beginning team migration ---'
@@ -30,58 +29,11 @@ namespace :team do
   # IMPORTANT: pending_join_requests is an array of User#id values
   #
 
-  def neq(attr, pg, mongo, fail_if_neq=true)
-    left =  pg.send(attr)
-    right = mongo.send(attr)
-
-    if left != right
-      puts "#{attr} | pg:#{pg.id} | mongo:#{mongo.id}| #{left} != #{right}"
-      true
-    else
-      false
-    end
-  rescue => ex
-    puts '*'*80
-    puts
-    puts ex
-    puts
-    puts '-'*80
-    puts
-    ap ex.backtrace
-    puts
-    puts '*'*80
-
-    require 'pry'; binding.pry
-  end
-
-  def neq_dec(attr, pg, mongo, fail_if_neq=true)
-    scale = 7
-
-    left =  pg.send(attr).to_d.round(scale)
-    right = mongo.send(attr).to_d.round(scale)
-
-
-    if left != right
-      puts "#{attr} | pg:#{pg.id} | mongo:#{mongo.id}| #{left} != #{right}"
-      true
-    else
-      false
-    end
-  rescue => ex
-    puts '*'*80
-    puts
-    puts ex
-    puts
-    puts '-'*80
-    puts
-    ap ex.backtrace
-    puts
-    puts '*'*80
-
-    require 'pry'; binding.pry
-  end
-
   task verify: :environment do
+    ActiveRecord::Base.logger = nil
+    Mongoid.logger = nil
+    Moped.logger = nil
+
     PgTeam.find_each(batch_size: 100) do |pg_team|
       begin
         mongo_id = pg_team.mongo_id
@@ -263,12 +215,56 @@ namespace :team do
           end
         end
 
-
         # TODO: Pending Requests
       end
     end
   end
 
+  def neq(attr, pg, mongo, fail_if_neq=true)
+    left =  pg.send(attr)
+    right = mongo.send(attr)
+
+    if left != right
+      puts "#{attr} | pg:#{pg.id} | mongo:#{mongo.id}| #{left} != #{right}"
+      true
+    else
+      false
+    end
+  rescue => ex
+    print_neq_error(ex)
+  end
+
+  def neq_dec(attr, pg, mongo, fail_if_neq=true)
+    scale = 7
+
+    left =  pg.send(attr).to_d.round(scale)
+    right = mongo.send(attr).to_d.round(scale)
+
+
+    if left != right
+      puts "#{attr} | pg:#{pg.id} | mongo:#{mongo.id}| #{left} != #{right}"
+      true
+    else
+      false
+    end
+  rescue => ex
+    print_neq_error(ex)
+  end
+
+  def print_neq_error(ex)
+    puts '*'*80
+    puts
+    puts ex
+    puts
+    puts '-'*80
+    puts
+    ap ex.backtrace
+    puts
+    puts '*'*80
+
+    require 'pry'; binding.pry
+  end
+
   task counts: :environment do
     pg_team_count = PgTeam.count
     puts "PgTeam.count=#{pg_team_count}"
diff --git a/Vagrantfile b/Vagrantfile
@@ -15,8 +15,10 @@ EOF
 require 'yaml'
 custom_settings = File.file?('vagrant.yml') ?  YAML.load_file('vagrant.yml') : {}
 
-puts '== Using Custom Vagrant Settings =='
-puts custom_settings.inspect
+if ENV['VAGRANT_DEBUG']
+  puts '== Using Custom Vagrant Settings =='
+  puts custom_settings.inspect
+end
 
 VAGRANTFILE_API_VERSION = "2"
 
@@ -71,23 +73,28 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     puts "Please install the 'vagrant-vbguest' plugin"
   end
 
-  #if Vagrant.has_plugin?('vagrant-cachier')
-    #config.cache.scope = :box
-  #else
-    #puts "Please install the 'vagrant-cachier' plugin"
-  #end
+  if Vagrant.has_plugin?('vagrant-cachier')
+    config.cache.scope = :box
+  else
+    puts "Please install the 'vagrant-cachier' plugin"
+  end
 end
 
 def set_port_mapping_for(config, service, guest_port, settings, force = false)
   if settings['network'] && settings['network']['port_mappings'] && settings['network']['port_mappings'][service]
     host_port = settings['network']['port_mappings'][service]
-    puts " !! Setting up port mapping rule for #{service} host:#{host_port} => guest:#{guest_port}"
+
+    if ENV['VAGRANT_DEBUG']
+      puts " !! Setting up port mapping rule for #{service} host:#{host_port} => guest:#{guest_port}"
+    end
     config.vm.network(:forwarded_port, guest: guest_port,  host: host_port)
   else
     # no host port mapping was defined
     if force
       # but we want to force a mapping for the default ports
-      puts " !! Setting up port mapping rule for #{service} host:#{guest_port} => guest:#{guest_port}"
+      if ENV['VAGRANT_DEBUG']
+        puts " !! Setting up port mapping rule for #{service} host:#{guest_port} => guest:#{guest_port}"
+      end
       config.vm.network(:forwarded_port, guest: guest_port,  host: guest_port)
     end
   end
diff --git a/config/database.yml b/config/database.yml
@@ -2,39 +2,19 @@ default: &default
   adapter: postgresql
   encoding: unicode
   pool: 5
-<%
-  if ENV['DOCKER_DATABASE_URL']
-    database_name = URI(ENV['DOCKER_DATABASE_URL']).path[1..-1]
-%>
-  # url: <%= ENV['DOCKER_DATABASE_URL'] %> Needs Rails 4
-  # postgresql://user:password@host:port/database
-
-
-  username: <%= URI(ENV['DOCKER_DATABASE_URL']).user %>
-  <% if URI(ENV['DOCKER_DATABASE_URL']).password.present? %>
-  password: <%= URI(ENV['DOCKER_DATABASE_URL']).password %>
-  <% end %>
-  #host: <%= URI(ENV['DOCKER_DATABASE_URL']).host %>
-  host: coderwall.local
-  port: <%= URI(ENV['DOCKER_DATABASE_URL']).port %>
-<%
-  else
-    database_name = 'coderwall'
-%>
   username: vagrant
-  password:
   host: localhost
   port: 5432
-<% end %>
+  password:
 
 development:
-  database: <%= "#{database_name}_development" %>
   <<: *default
+  database: coderwall_development
 
 test:
-  database: <%= "#{database_name}_test" %>
   <<: *default
+  database: coderwall_test
 
 production:
-  database: <%= "#{database_name}_production" %>
   <<: *default
+  database: coderwall_production
