banjo-apn_sender 2.0.1 → 2.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmViNGY0ZDRiZDE3NjZlMmJjODlkM2QyZDNjY2U3NWNmN2Q2NjE4YQ==
+  data.tar.gz: !binary |-
+    NWVhYzU5YzNjZjkzOTQyZmQ0NWRhYTk0ZTc1N2M1NmU0OWY1ZDI2Yg==
+SHA512:
+  metadata.gz: !binary |-
+    MDZmMjJjODgyOTVjY2MyODIzNjk3ZjQ5NDg0NWNjZDAwZjlmN2JiOTdkZjA1
+    MjY5YmQ5MWRkOTMxZjQ3MDFhNjVhNzUzN2I1YzdkYWJhYmY2ZDBlOTMyODJl
+    OGVlNTBlMzFkYjJlNTE4NTU2NmQwY2FiZTgyOGE1NzQxMjcwNzI=
+  data.tar.gz: !binary |-
+    ZTlhZGRiZjQ1M2VkMTE0NzNmZTFkYzMwOTQ2ZDdmNmM4MjMzNDkwM2UyMWY5
+    MGQzODk1MDczMDNmMTliMjUyYzRjNGZhZDM4ZTc4M2ZmZGExOTM1MjYyYWVj
+    YmEyNWIwNWE2YjE0MTFlZTc2ZTFhZmIxNmMyMjExMGY1OGRiNDM=

data/apn_sender.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{banjo-apn_sender}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kali Donovan}, %q{KW Justin Leung}]

data/lib/apn/base.rb

@@ -5,10 +5,13 @@ module APN
     # APN::Base takes care of all the boring certificate loading, socket creating, and logging
     # responsibilities so APN::Sender and APN::Feedback and focus on their respective specialties.
     module Base
-      attr_accessor :opts, :logger
+      attr_accessor :opts, :logger, :fifos
+      
+      FIFO_SIZE = 5
       
       def initialize(opts = {})
         @opts = opts
+        @fifos = Hash.new { [] }
 
         setup_logger
         setup_paths
@@ -21,12 +24,6 @@ module APN
         return @socket
       end
             
-      protected
-      # Default to Rails logger, if available
-      def setup_logger
-        @logger = defined?(::Rails.logger) ? ::Rails.logger : Logger.new(STDOUT)
-      end
-      
       # Log message to any logger provided by the user (e.g. the Rails logger).
       # Accepts +log_level+, +message+, since that seems to make the most sense,
       # and just +message+, to be compatible with Resque's log method and to enable
@@ -38,7 +35,7 @@ module APN
         level, message = 'info', level if message.nil? # Handle only one argument if called from Resque, which expects only message
 
         return false unless self.logger && self.logger.respond_to?(level)
-        self.logger.send(level, "[#{apn_environment}] #{Time.now}: #{message}")
+        self.logger.send(level, "[APNConnection:#{object_id} #{apn_environment}] #{message}")
       end
       
       # Log the message first, to ensure it reports what went wrong if in daemon mode. 
@@ -48,6 +45,12 @@ module APN
         raise msg
       end
       
+      protected
+      # Default to Rails logger, if available
+      def setup_logger
+        @logger = defined?(::Rails.logger) ? ::Rails.logger : Logger.new(STDOUT)
+      end
+      
       def apn_enterprise?
         @apn_enterprise ||= @opts[:enterprise].present?
       end      
@@ -89,6 +92,7 @@ module APN
         return true if @socket && @socket_tcp && !@socket.closed? && !@socket_tcp.closed?
         log_and_die("Trying to open half-open connection") if (@socket && !@socket.closed?) || (@socket_tcp && !@socket_tcp.closed?)
 
+        log(:info, "Setting up SSL connection to APN...")
         ctx = OpenSSL::SSL::SSLContext.new
         ctx.cert = OpenSSL::X509::Certificate.new(@apn_cert)
         ctx.key = OpenSSL::PKey::RSA.new(@apn_cert)

data/lib/apn/connection.rb

@@ -6,22 +6,30 @@ class APN::Connection
   @sandbox_senders = Hash.new
   @enterprise_semaphore = Mutex.new
 
-  def send_to_apple(notification)
+
+  def push_fifo(env, token)
+    @fifos[env] <<= token
+    @fifos[env].shift if @fifos[env][FIFO_SIZE]
+  end
+
+  def send_to_apple(notification, token, env, tag)
     retries = 0
+    push_fifo(env, token)
 
     begin
       self.socket.write( notification.to_s )
     rescue => e
-      Rails.logger.error("Try #{retries}: APNConnection to #{apn_host} error with #{e}")
+      log(:error, "Try #{retries}: #{e.class} to #{apn_host}: #{e.message}, recent_tokens: #{@fifos[env]}")
 
       # Try reestablishing the connection
       if (retries += 1) <= TIMES_TO_RETRY_SOCKET_ERROR
         teardown_connection
+        sleep 1
         setup_connection
         retry
       end
 
-      Rails.logger.error("APNConnection gave up send_to_apple after #{retries} failures")
+      log(:error, "#{e.class} to #{apn_host}: #{e.message}, recent_tokens: #{@fifos[env]}")
       raise e
     end
   end
@@ -47,11 +55,14 @@ class APN::Connection
       end
     end
      
-    Rails.logger.info "[APNConnection:#{sender.object_id} #{sandbox ? 'sandbox' : 'production'}#{enterprise ? ' enterprise' : ''}] token: #{token} message: #{options}"
+    env = sandbox ? 'sandbox' : enterprise ? 'enterprise' : 'production'
+    tag = "#{sandbox ? 'sandbox' : 'production'}#{enterprise ? ' enterprise' : ''}"
+    sender.log(:info, "token: #{token} message: #{options}")
+
     if enterprise
-      @enterprise_semaphore.synchronize { sender.send_to_apple(msg) }
+      @enterprise_semaphore.synchronize { sender.send_to_apple(msg, token, env, tag) }
     else
-      sender.send_to_apple(msg)
+      sender.send_to_apple(msg, token, env, tag)
     end
   end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banjo-apn_sender
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.0.2
 platform: ruby
 authors:
 - Kali Donovan
@@ -15,7 +14,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: apn_sender
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -68,25 +63,24 @@ files:
 - lib/apn/notification.rb
 homepage: http://github.com/BanjoInc/apn_sender
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: APN connection pluggable to multithreaded background worker (like SideKiq)