rapns 2.0.4 → 2.0.5.rc1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.5.rc1 (Oct 5, 2012) ##
+  * Release db connections back into the pool after use (#72).
+  * Continue to start daemon if a connection cannot be made during startup (#62) (@mattconnolly).
+
 ## 2.0.4 (Aug 6, 2012) ##
   * Don't exit when there aren't any Rapns::App instances, just warn (#55).
 

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/ileitch/rapns.png)](http://travis-ci.org/ileitch/rapns)
+[![Build Status](https://secure.travis-ci.org/ileitch/rapns.png?branch=master)](http://travis-ci.org/ileitch/rapns)
 
 # Features
 
@@ -164,4 +164,5 @@ Thank you to the following wonderful people for contributing to rapns:
 * [@tompesman](https://github.com/tompesman)
 * [@EpicDraws](https://github.com/EpicDraws)
 * [@dei79](https://github.com/dei79)
-* [@adorr](https://github.com/adorr)
+* [@adorr](https://github.com/adorr)
+* [@mattconnolly](https://github.com/mattconnolly)

data/config/database.yml

@@ -0,0 +1,31 @@
+# postgresql is the default if no ADAPTER environment variable is set when running specs.
+
+postgresql:
+  adapter: postgresql
+  database: rapns_test
+  host: localhost
+  username: postgres
+  password: ""
+
+jdbcpostgresql:
+  adapter: jdbcpostgresql
+  database: rapns_test
+  host: localhost
+  username: postgres
+  password: ""
+
+mysql:
+  adapter: mysql
+  database: rapns_test
+  host: localhost
+  username: rapns_test
+  password: ""
+  encoding: utf8
+
+mysql2:
+  adapter: mysql
+  database: rapns_test
+  host: localhost
+  username: rapns_test
+  password: ""
+  encoding: utf8

data/lib/rapns/daemon/app_runner.rb

@@ -42,8 +42,12 @@ module Rapns
             feedback_host, feedback_port = HOSTS[app.environment.to_sym][:feedback]
             feedback_poll = Rapns::Daemon.config.feedback_poll
             runner = AppRunner.new(app, push_host, push_port, feedback_host, feedback_port, feedback_poll)
-            runner.start
-            @all[app.key] = runner
+            begin
+              runner.start
+              @all[app.key] = runner
+            rescue
+              Rapns::Daemon.logger.info("[App:#{app.key}] failed to start. No notifications will be sent.")
+            end
           end
         end
 
@@ -72,11 +76,19 @@ module Rapns
         @handlers = []
       end
 
-      def start
-        @feedback_receiver = FeedbackReceiver.new(@app.key, @feedback_host, @feedback_port, @feedback_poll, @app.certificate, @app.password)
-        @feedback_receiver.start
 
-        @app.connections.times { @handlers << start_handler }
+      def start
+        begin
+          @feedback_receiver = FeedbackReceiver.new(@app.key, @feedback_host, @feedback_port, @feedback_poll, @app.certificate, @app.password)
+          @feedback_receiver.start
+
+          @app.connections.times { @handlers << start_handler }
+        rescue OpenSSL::SSL::SSLError
+          # these errors mean that a connection is not possible, raise back to caller
+          raise
+        rescue StandardError => e
+          Rapns::Daemon.logger.error(e)
+        end
       end
 
       def deliver(notification)

data/lib/rapns/daemon/connection.rb

@@ -105,6 +105,9 @@ module Rapns
         ssl_socket.connect
         Rapns::Daemon.logger.info("[#{@name}] Connected to #{@host}:#{@port}")
         [tcp_socket, ssl_socket]
+      rescue StandardError => e
+        Rapns::Daemon.logger.error("[#{@name}] Error connecting to #{@host}:#{@port} : #{e}")
+        raise
       end
     end
   end

data/lib/rapns/daemon/database_reconnectable.rb

@@ -12,7 +12,9 @@ module Rapns
 
       def with_database_reconnect_and_retry
         begin
-          yield
+          ActiveRecord::Base.connection_pool.with_connection do
+            yield
+          end
         rescue *ADAPTER_ERRORS => e
           Rapns::Daemon.logger.error(e)
           database_connection_lost

data/lib/rapns/daemon/feedback_receiver.rb

@@ -2,11 +2,12 @@ module Rapns
   module Daemon
     class FeedbackReceiver
       include InterruptibleSleep
+      include DatabaseReconnectable
 
       FEEDBACK_TUPLE_BYTES = 38
 
-      def initialize(app, host, port, poll, certificate, password)
-        @app = app
+      def initialize(name, host, port, poll, certificate, password)
+        @name = name
         @host = host
         @port = port
         @poll = poll
@@ -17,8 +18,17 @@ module Rapns
       def start
         @thread = Thread.new do
           loop do
-            break if @stop
-            check_for_feedback
+            begin
+              break if @stop
+              check_for_feedback
+            rescue OpenSSL::SSL::SSLError
+              # stop the thread if there is an SSL error. Other errors might be recoverable,
+              # and retrying later might make sense (for example, a network outage)
+              @stop = true
+              break
+            rescue
+              # error will be logged in check_for_feedback
+            end
             interruptible_sleep @poll
           end
         end
@@ -33,7 +43,7 @@ module Rapns
       def check_for_feedback
         connection = nil
         begin
-          connection = Connection.new("FeedbackReceiver:#{@app}", @host, @port, @certificate, @password)
+          connection = Connection.new("FeedbackReceiver:#{@name}", @host, @port, @certificate, @password)
           connection.connect
 
           while tuple = connection.read(FEEDBACK_TUPLE_BYTES)
@@ -42,6 +52,7 @@ module Rapns
           end
         rescue StandardError => e
           Rapns::Daemon.logger.error(e)
+          raise
         ensure
           connection.close if connection
         end
@@ -56,8 +67,10 @@ module Rapns
 
       def create_feedback(failed_at, device_token)
         formatted_failed_at = failed_at.strftime("%Y-%m-%d %H:%M:%S UTC")
-        Rapns::Daemon.logger.info("[FeedbackReceiver:#{@app}] Delivery failed at #{formatted_failed_at} for #{device_token}")
-        Rapns::Feedback.create!(:failed_at => failed_at, :device_token => device_token, :app => @app)
+        with_database_reconnect_and_retry do
+          Rapns::Daemon.logger.info("[FeedbackReceiver:#{@name}] Delivery failed at #{formatted_failed_at} for #{device_token}")
+          Rapns::Feedback.create!(:failed_at => failed_at, :device_token => device_token, :app => @name)
+        end
       end
     end
   end

data/lib/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = '2.0.4'
+  VERSION = '2.0.5.rc1'
 end

data/spec/rapns/daemon/connection_spec.rb

@@ -110,7 +110,7 @@ describe Rapns::Daemon::Connection do
     it "ignores IOError when the socket is already closed" do
       tcp_socket.stub(:close).and_raise(IOError)
       connection.connect
-      expect { connection.close }.should_not raise_error(IOError)
+      expect { connection.close }.to_not raise_error(IOError)
     end
   end
 

data/spec/rapns/daemon/feedback_receiver_spec.rb

@@ -66,7 +66,7 @@ describe Rapns::Daemon::FeedbackReceiver, 'check_for_feedback' do
     error = StandardError.new('bork!')
     connection.stub(:read).and_raise(error)
     Rapns::Daemon.logger.should_receive(:error).with(error)
-    receiever.check_for_feedback
+    lambda { receiever.check_for_feedback }.should raise_error
   end
 
   it 'sleeps for the feedback poll period' do

data/spec/rapns/notification_spec.rb

@@ -43,7 +43,7 @@ end
 
 describe Rapns::Notification, "when assigning the attributes for the device" do
   it "should raise an ArgumentError if something other than a Hash is assigned" do
-    expect { Rapns::Notification.new(:attributes_for_device => Array.new) }.should
+    expect { Rapns::Notification.new(:attributes_for_device => Array.new) }.to \
       raise_error(ArgumentError, "attributes_for_device must be a Hash")
   end
 

data/spec/spec_helper.rb

@@ -10,37 +10,37 @@ rescue LoadError
 end
 
 require 'active_record'
-adapters = ['mysql', 'mysql2', 'postgresql', 'jdbcpostgresql']
 
 jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
-$adapter = if ENV['ADAPTER']
-  ENV['ADAPTER']
-elsif jruby
-  'jdbcpostgresql'
-else
-  'postgresql'
+$adapter = ENV['ADAPTER'] ||
+  if jruby
+    'jdbcpostgresql'
+  else
+    'postgresql'
+  end
+
+DATABASE_CONFIG = YAML.load_file(File.expand_path("../config/database.yml", File.dirname(__FILE__)))
+db_config = DATABASE_CONFIG[$adapter]
+
+if db_config.nil?
+  puts "No such adapter '#{$adapter}'. Valid adapters are #{DATABASE_CONFIG.keys.join(', ')}."
+  exit 1
 end
 
 if jruby
   if ENV['TRAVIS']
-    username = 'postgres'
+    db_config['username'] = 'postgres'
   else
     require 'etc'
-    username = Etc.getlogin
+    db_config['username'] = Etc.getlogin
   end
-else
-  username = nil
-end
-
-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('username' => username, 'adapter' => $adapter, 'database' => 'rapns_test')
+ActiveRecord::Base.establish_connection(db_config)
+
 require 'generators/templates/create_rapns_notifications'
 require 'generators/templates/create_rapns_feedback'
 require 'generators/templates/add_alert_is_json_to_rapns_notifications'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 2.0.4
-  prerelease: 
+  version: 2.0.5.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -35,6 +35,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
 - lib/generators/rapns_generator.rb
 - lib/generators/templates/add_alert_is_json_to_rapns_notifications.rb
 - lib/generators/templates/add_app_to_rapns.rb
@@ -66,9 +69,7 @@ files:
 - 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
-- CHANGELOG.md
-- LICENSE
+- config/database.yml
 - spec/rapns/daemon/app_runner_spec.rb
 - spec/rapns/daemon/connection_spec.rb
 - spec/rapns/daemon/database_reconnectable_spec.rb
@@ -100,9 +101,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -110,6 +111,7 @@ signing_key:
 specification_version: 3
 summary: Easy to use, full featured APNs daemon for Rails 3
 test_files:
+- config/database.yml
 - spec/rapns/daemon/app_runner_spec.rb
 - spec/rapns/daemon/connection_spec.rb
 - spec/rapns/daemon/database_reconnectable_spec.rb