Move patches out of daemon, require them after the Rails environment …

…is loaded

bin/rapns

@@ -1,17 +1,17 @@
 #!/usr/bin/env ruby
 
-require "optparse"
-require "rapns"
-require "rapns/daemon"
+require 'optparse'
+require 'rapns'
+require 'rapns/daemon'
 
 foreground = false
 environment = ARGV[0]
-banner = "Usage: rapns <Rails environment> [options]"
+banner = 'Usage: rapns <Rails environment> [options]'
 ARGV.options do |opts|
   opts.banner = banner
-  opts.on("-f", "--foreground", "Run in the foreground.") { foreground = true }
-  opts.on("-v", "--version", "Print this version of rapns.") { puts "rapns #{Rapns::VERSION}"; exit }
-  opts.on("-h", "--help", "You're looking at it.") { puts opts; exit }
+  opts.on('-f', '--foreground', 'Run in the foreground.') { foreground = true }
+  opts.on('-v', '--version', 'Print this version of rapns.') { puts "rapns #{Rapns::VERSION}"; exit }
+  opts.on('-h', '--help', 'You\'re looking at it.') { puts opts; exit }
   opts.parse!
 end
 
@@ -20,7 +20,9 @@ if environment.nil?
   exit 1
 end
 
-ENV["RAILS_ENV"] = environment
-load "config/environment.rb"
+ENV['RAILS_ENV'] = environment
+load 'config/environment.rb'
+
+require 'rapns/patches'
 
 Rapns::Daemon.start(environment, foreground)

lib/rapns/daemon.rb

@@ -14,8 +14,6 @@
 require 'rapns/daemon/feeder'
 require 'rapns/daemon/logger'
 
-require 'rapns/daemon/patches'
-
 module Rapns
   module Daemon
     class << self

lib/rapns/patches.rb

@@ -0,0 +1,6 @@
+if ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'postgresql'
+  if Rails::VERSION::STRING == '3.1.0' || Rails::VERSION::STRING == '3.1.1'
+    STDERR.puts "[WARNING] Detected Rails #{Rails::VERSION::STRING}, patching PostgreSQLAdapter to fix reconnection bug: https://github.com/rails/rails/issues/3160."
+    require "rapns/patches/rails/#{Rails::VERSION::STRING}/postgresql_adapter.rb"
+  end
+end