push-apns 1.0.1 → 1.0.2

data/lib/push-apns/version.rb

@@ -1,3 +1,3 @@
 module PushApns
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/push/configuration_apns.rb

@@ -1,10 +1,11 @@
 module Push
   class ConfigurationApns < Push::Configuration
-    store :properties, accessors: [:certificate, :certificate_password, :sandbox, :feedback_poll]
+    store :properties, accessors: [:certificate, :certificate_password, :sandbox, :feedback_poll, :skip_check_for_error]
     attr_accessible :app, :enabled, :connections, :certificate, :certificate_password, :sandbox, :feedback_poll
     validates :certificate, :presence => true
     validates :sandbox, :inclusion => { :in => [true, false] }
     validates :feedback_poll, :presence => true
+    validates :skip_check_for_error, :inclusion => { :in => [true, false] }, :allow_blank => true
 
     def name
       :apns

data/lib/push/daemon/apns_support/connection_apns.rb

@@ -51,7 +51,7 @@ module Push
 
           begin
             write_data(data)
-          rescue Errno::EPIPE, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError => e
+          rescue Errno::EPIPE, Errno::ETIMEDOUT, Errno::ECONNRESET, OpenSSL::SSL::SSLError => e
             retry_count += 1;
 
             if retry_count == 1

data/lib/push/daemon/apns_support/feedback_receiver.rb

@@ -3,6 +3,8 @@ module Push
     module ApnsSupport
       class FeedbackReceiver
         include Push::Daemon::InterruptibleSleep
+        include Push::Daemon::DatabaseReconnectable
+
         FEEDBACK_TUPLE_BYTES = 38
 
         def initialize(provider)
@@ -32,7 +34,7 @@ module Push
 
             while tuple = connection.read(FEEDBACK_TUPLE_BYTES)
               timestamp, device = parse_tuple(tuple)
-              create_feedback(timestamp, device)
+              create_feedback(connection, timestamp, device)
             end
           rescue StandardError => e
             Push::Daemon.logger.error(e)
@@ -48,10 +50,12 @@ module Push
           [Time.at(failed_at).utc, device]
         end
 
-        def create_feedback(failed_at, device)
+        def create_feedback(connection, failed_at, device)
           formatted_failed_at = failed_at.strftime("%Y-%m-%d %H:%M:%S UTC")
-          Push::Daemon.logger.info("[FeedbackReceiver] Delivery failed at #{formatted_failed_at} for #{device}")
-          Push::FeedbackApns.create!(:app => @provider.configuration[:name], :failed_at => failed_at, :device => device, :follow_up => 'delete')
+          Push::Daemon.logger.info("[#{connection.name}: Delivery failed at #{formatted_failed_at} for #{device}")
+          with_database_reconnect_and_retry(connection.name) do
+            Push::FeedbackApns.create!(:app => @provider.configuration[:name], :failed_at => failed_at, :device => device, :follow_up => 'delete')
+          end
         end
       end
     end

data/lib/push/message_apns.rb

@@ -76,6 +76,9 @@ module Push
     end
 
     def check_for_error(connection)
+      # check for true, because check_for_error can be nil
+      return if connection.provider.configuration[:skip_check_for_error] == true
+
       if connection.select(SELECT_TIMEOUT)
         error = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: push-apns
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70129790660280 !ruby/object:Gem::Requirement
+  requirement: &70256296415060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129790660280
+  version_requirements: *70256296415060
 - !ruby/object:Gem::Dependency
   name: push-core
-  requirement: &70129790659040 !ruby/object:Gem::Requirement
+  requirement: &70256296414560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70129790659040
+  version_requirements: *70256296414560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70129790658180 !ruby/object:Gem::Requirement
+  requirement: &70256296414180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129790658180
+  version_requirements: *70256296414180
 description: APNS support for the modular push daemon.
 email:
 - tom@tnux.net