rapns 0.1.4 → 0.2.0

data/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)

data/lib/rapns/daemon/feeder.rb

@@ -1,3 +1,9 @@
+class PGError < StandardError; end if !defined?(PGError)
+module Mysql; class Error < StandardError; end; end if !defined?(Mysql)
+module Mysql2; class Error < StandardError; end; end if !defined?(Mysql2)
+
+ADAPTER_ERRORS = [PGError, Mysql::Error, Mysql2::Error]
+
 module Rapns
   module Daemon
     class Feeder
@@ -15,6 +21,9 @@ module Rapns
           end
 
           Rapns::Daemon.delivery_queue.wait_until_empty
+        rescue ActiveRecord::StatementInvalid, *ADAPTER_ERRORS => e
+          Rapns::Daemon.logger.error(e)
+          reconnect
         rescue StandardError => e
           Rapns::Daemon.logger.error(e)
         end
@@ -25,6 +34,24 @@ module Rapns
       def self.stop
         @stop = true
       end
+
+      def self.reconnect
+        Rapns::Daemon.logger.warn('Lost connection to database, reconnecting...')
+        attempts = 0
+        loop do
+          begin
+            Rapns::Daemon.logger.warn("Attempt #{attempts += 1}")
+            ActiveRecord::Base.clear_all_connections!
+            ActiveRecord::Base.establish_connection
+            Rapns::Notification.count
+            break
+          rescue *ADAPTER_ERRORS => e
+            Rapns::Daemon.logger.error(e, :airbrake_notify => false)
+            sleep 2 # Avoid thrashing.
+          end
+        end
+        Rapns::Daemon.logger.warn('Database reconnected')
+      end
     end
   end
 end

data/lib/rapns/daemon/logger.rb

@@ -3,7 +3,7 @@ module Rapns
     class Logger
       def initialize(options)
         @options = options
-        log_path = File.join(Rails.root, "log", "rapns.log")
+        log_path = File.join(Rails.root, 'log', 'rapns.log')
         @logger = ActiveSupport::BufferedLogger.new(log_path, Rails.logger.level)
         @logger.auto_flushing = Rails.logger.auto_flushing
       end
@@ -12,13 +12,13 @@ module Rapns
         log(:info, msg)
       end
 
-      def error(msg)
-        airbrake_notify(msg) if msg.is_a?(Exception)
-        log(:error, msg, "ERROR")
+      def error(msg, options = {})
+        airbrake_notify(msg) if msg.is_a?(Exception) && options[:airbrake_notify] != false
+        log(:error, msg, 'ERROR')
       end
 
       def warn(msg)
-        log(:warn, msg, "WARNING")
+        log(:warn, msg, 'WARNING')
       end
 
       private

data/lib/rapns/daemon.rb

@@ -2,17 +2,17 @@ require 'thread'
 require 'socket'
 require 'pathname'
 
-require "rapns/daemon/configuration"
-require "rapns/daemon/certificate"
-require "rapns/daemon/delivery_error"
-require "rapns/daemon/pool"
-require "rapns/daemon/connection_pool"
-require "rapns/daemon/connection"
-require "rapns/daemon/delivery_queue"
-require "rapns/daemon/delivery_handler"
-require "rapns/daemon/delivery_handler_pool"
-require "rapns/daemon/feeder"
-require "rapns/daemon/logger"
+require 'rapns/daemon/configuration'
+require 'rapns/daemon/certificate'
+require 'rapns/daemon/delivery_error'
+require 'rapns/daemon/pool'
+require 'rapns/daemon/connection_pool'
+require 'rapns/daemon/connection'
+require 'rapns/daemon/delivery_queue'
+require 'rapns/daemon/delivery_handler'
+require 'rapns/daemon/delivery_handler_pool'
+require 'rapns/daemon/feeder'
+require 'rapns/daemon/logger'
 
 module Rapns
   module Daemon
@@ -26,7 +26,7 @@ module Rapns
       @foreground = foreground
       setup_signal_hooks
 
-      self.configuration = Configuration.new(environment, File.join(Rails.root, "config", "rapns", "rapns.yml"))
+      self.configuration = Configuration.new(environment, File.join(Rails.root, 'config', 'rapns', 'rapns.yml'))
       configuration.load
 
       self.logger = Logger.new(:foreground => foreground, :airbrake_notify => configuration.airbrake_notify)
@@ -49,6 +49,7 @@ module Rapns
       self.connection_pool = ConnectionPool.new(configuration.connections)
       connection_pool.populate
 
+      logger.info("Ready")
       Feeder.start
     end
 
@@ -57,7 +58,7 @@ module Rapns
     def self.setup_signal_hooks
       @shutting_down = false
 
-      ["SIGINT", "SIGTERM"].each do |signal|
+      ['SIGINT', 'SIGTERM'].each do |signal|
         Signal.trap(signal) do
           handle_shutdown_signal
         end
@@ -93,7 +94,7 @@ module Rapns
 
     def self.write_pid_file
       if !configuration.pid_file.blank?
-        File.open(configuration.pid_file, "w") do |f|
+        File.open(configuration.pid_file, 'w') do |f|
           f.puts $$
         end
       end

data/lib/rapns/patches/rails/3.1.0/postgresql_adapter.rb

@@ -0,0 +1,12 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class PostgreSQLAdapter < AbstractAdapter
+      def clear_cache!
+        @statements.each_value do |value|
+          @connection.query "DEALLOCATE #{value}" if active?
+        end
+        @statements.clear
+      end
+    end
+  end
+end

data/lib/rapns/patches/rails/3.1.1/postgresql_adapter.rb

@@ -0,0 +1,17 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class PostgreSQLAdapter < AbstractAdapter
+      class StatementPool < ConnectionAdapters::StatementPool
+        def dealloc(key)
+          @connection.query "DEALLOCATE #{key}" if connection_active?
+        end
+
+        def connection_active?
+          @connection.status == PGconn::CONNECTION_OK
+        rescue PGError
+          false
+        end
+      end
+    end
+  end
+end

data/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

data/lib/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/spec/rapns/daemon/feeder_spec.rb

@@ -4,7 +4,7 @@ describe Rapns::Daemon::Feeder do
   before do
     Rapns::Daemon::Feeder.stub(:sleep)
     @notification = Rapns::Notification.create!(:device_token => "a" * 64)
-    @logger = mock("Logger", :info => nil, :error => nil)
+    @logger = mock("Logger", :info => nil, :error => nil, :warn => nil)
     Rapns::Daemon.stub(:logger).and_return(@logger)
     @queue = mock(:push => nil, :wait_until_empty => nil)
     Rapns::Daemon.stub(:delivery_queue).and_return(@queue)
@@ -63,4 +63,82 @@ describe Rapns::Daemon::Feeder do
     Rapns::Daemon.logger.should_receive(:error).with(e)
     Rapns::Daemon::Feeder.enqueue_notifications
   end
+
+  context "when the database connection is lost" do
+    let(:error) { adapter_error.new("db down!") }
+    before do
+      ActiveRecord::Base.stub(:clear_all_connections!)
+      ActiveRecord::Base.stub(:establish_connection)
+      Rapns::Notification.stub(:ready_for_delivery).and_raise(error)
+    end
+
+    def adapter_error
+      case $adapter
+      when 'postgresql'
+        PGError
+      when 'mysql'
+        Mysql::Error
+      when 'mysql2'
+        Mysql2::Error
+      else
+        raise "Please update #{__FILE__} for adapter #{$adapter}"
+      end
+    end
+
+    it "should log the error raised" do
+      Rapns::Daemon.logger.should_receive(:error).with(error)
+      Rapns::Daemon::Feeder.enqueue_notifications
+    end
+
+    it "should log that the database is being reconnected" do
+      Rapns::Daemon.logger.should_receive(:warn).with("Lost connection to database, reconnecting...")
+      Rapns::Daemon::Feeder.enqueue_notifications
+    end
+
+    it "should log the reconnection attempt" do
+      Rapns::Daemon.logger.should_receive(:warn).with("Attempt 1")
+      Rapns::Daemon::Feeder.enqueue_notifications
+    end
+
+    it "should clear all connections" do
+      ActiveRecord::Base.should_receive(:clear_all_connections!)
+      Rapns::Daemon::Feeder.enqueue_notifications
+    end
+
+    it "should establish a new connection" do
+      ActiveRecord::Base.should_receive(:establish_connection)
+      Rapns::Daemon::Feeder.enqueue_notifications
+    end
+
+    it "should test out the new connection by performing a count" do
+      Rapns::Notification.should_receive(:count)
+      Rapns::Daemon::Feeder.enqueue_notifications
+    end
+
+    context "when the reconnection attempt is not successful" do
+      let(:error) { adapter_error.new("shit got real") }
+
+      before do
+        class << Rapns::Notification
+          def count
+            @count_calls += 1
+            return if @count_calls == 2
+            raise @error
+          end
+        end
+        Rapns::Notification.instance_variable_set("@count_calls", 0)
+        Rapns::Notification.instance_variable_set("@error", error)
+      end
+
+      it "should log errors raised when the reconnection is not successful without notifying airbrake" do
+        Rapns::Daemon.logger.should_receive(:error).with(error, :airbrake_notify => false)
+        Rapns::Daemon::Feeder.enqueue_notifications
+      end
+
+      it "should sleep to avoid thrashing when the database is down" do
+        Rapns::Daemon::Feeder.should_receive(:sleep).with(2)
+        Rapns::Daemon::Feeder.enqueue_notifications
+      end
+    end
+  end
 end

data/spec/rapns/daemon/logger_spec.rb

@@ -88,6 +88,13 @@ describe Rapns::Daemon::Logger do
     logger.error(e)
   end
 
+  it "should not notify Airbrake if explicitly disabled in the call to error" do
+    e = RuntimeError.new("hi mom")
+    logger = Rapns::Daemon::Logger.new(:foreground => false, :airbrake_notify => true)
+    Airbrake.should_not_receive(:notify).with(e)
+    logger.error(e, :airbrake_notify => false)
+  end
+
   it "should not attempt to notify Airbrake of the error is not an Exception" do
     logger = Rapns::Daemon::Logger.new(:foreground => false)
     Airbrake.should_not_receive(:notify)

data/spec/rapns/daemon_spec.rb

@@ -27,7 +27,7 @@ describe Rapns::Daemon, "when starting" do
     Rapns::Daemon::Feeder.stub(:wait)
     Rapns::Daemon.stub(:daemonize)
     Rapns::Daemon.stub(:write_pid_file)
-    @logger = mock("Logger")
+    @logger = mock("Logger", :info => nil)
     Rapns::Daemon::Logger.stub(:new).and_return(@logger)
   end
 

data/spec/spec_helper.rb

@@ -1,30 +1,45 @@
-ENV["RAILS_ENV"] = "test"
+ENV['RAILS_ENV'] = 'test'
 
 require 'simplecov'
 SimpleCov.start do
   add_filter '/spec/'
 end
 
-require "active_record"
+require 'active_record'
+adapters = ['mysql', 'mysql2', 'postgresql']
+$adapter = ENV['ADAPTER'] || 'postgresql'
 
-ActiveRecord::Base.establish_connection("adapter" => "postgresql", "database" => "rapns_test")
-require "generators/templates/create_rapns_notifications"
+if !adapters.include?($adapter)
+  puts "No such adapter '#{$adapter}'. Valid adapters are #{adapters.join(', ')}."
+  exit 1
+end
+
+puts "Using #{$adapter} adapter."
+ActiveRecord::Base.establish_connection('adapter' => $adapter, 'database' => 'rapns_test')
+require 'generators/templates/create_rapns_notifications'
 
 CreateRapnsNotifications.down rescue ActiveRecord::StatementInvalid
 CreateRapnsNotifications.up
 
 Bundler.require(:default)
 
-require "shoulda"
+require 'shoulda'
 require 'database_cleaner'
+
 DatabaseCleaner.strategy = :truncation
 
-require "rapns"
-require "rapns/daemon"
+require 'rapns'
+require 'rapns/daemon'
+
+require 'perftools'
 
 RSpec.configure do |config|
+  # config.before :suite do
+  #   PerfTools::CpuProfiler.start('/tmp/rapns_profile')
+  # end
+  # config.after :suite do
+  #   PerfTools::CpuProfiler.stop
+  # end
+
   config.before(:each) { DatabaseCleaner.clean }
 end
-
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-08 00:00:00.000000000Z
+date: 2011-10-09 00:00:00.000000000Z
 dependencies: []
 description: Easy to use library for Apple's Push Notification Service with Rails
   3
@@ -38,6 +38,9 @@ files:
 - lib/rapns/daemon/logger.rb
 - lib/rapns/daemon/pool.rb
 - lib/rapns/notification.rb
+- lib/rapns/patches.rb
+- lib/rapns/patches/rails/3.1.0/postgresql_adapter.rb
+- lib/rapns/patches/rails/3.1.1/postgresql_adapter.rb
 - lib/rapns/version.rb
 - README.md
 - spec/rapns/daemon/certificate_spec.rb