apple_shove 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b119daa9b46ae843bed8fc8327dd77ac20189551
-  data.tar.gz: f2a2c0b62cc2593f5f3a1cb3a239552cd3092028
+  metadata.gz: 09ae191145591b48d3b07274e4ddf795ae864f48
+  data.tar.gz: ffce5236fe7521703eb218f119218056e536554a
 SHA512:
-  metadata.gz: 329d709e3ea8811764a41fe55928e3a2e48bb1a62262c920c15d3c8166c8901b2d92a3e2ec4c3bed360f92ee582b78e023804af41cf053932dbaaca3ab77e3e8
-  data.tar.gz: fdad094d6ff2b8519ec200e2b4066b7a2a0d5f26bfce390370c389e7bcc5d061c450b780bcbf265a174837269a7267ffa0948370e8edf26594c86fb77ac2e5a4
+  metadata.gz: 3a5bfdb8a2e81a9da2e13e393aa2b015ae671470faba143ab2c4eec5f85b11e4af3b7f4670b5b36855a6625769b22ab70887195670defa4436cc9058db004939
+  data.tar.gz: a75ded949908014b09871ee283dfcbe69ccb1b005bfa2b3129b118a6589b1a2365b2ed562adfee1651c09616132315fbaba4e423db371bcfb213decdad11d228

data/lib/apple_shove/apns/connection.rb

@@ -3,9 +3,9 @@ require 'openssl'
 module AppleShove
   module APNS
     class Connection
-      
+
       attr_reader :last_used
-      
+
       def initialize(host, port, p12_string)
         @host       = host
         @port       = port
@@ -22,7 +22,7 @@ module AppleShove
 
       def disconnect
         @ssl_sock.close if @ssl_sock
-        
+
         begin
           @sock.close if @sock
         rescue IOError
@@ -35,8 +35,12 @@ module AppleShove
         connect
       end
 
+      def safe_last_used
+        @last_used || Time.at(0)
+      end
+
       private
-      
+
       def connect
         @p12          ||= OpenSSLHelper.pkcs12_from_pem(@p12_string)
         context         = ::OpenSSL::SSL::SSLContext.new
@@ -47,14 +51,14 @@ module AppleShove
         @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
         @ssl_sock       = ::OpenSSL::SSL::SSLSocket.new(@sock, context)
         @ssl_sock.sync  = true
-        
+
         @ssl_sock.connect
       end
-      
+
       def connected?
         @sock && @ssl_sock
       end
-            
+
     end
   end
 end

data/lib/apple_shove/apns/notify_connection.rb

@@ -33,7 +33,7 @@ module AppleShove
         message = notification.binary_message
 
         begin
-          if @last_used && Time.now - @last_used > CONFIG[:reconnect_timer] * 60
+          if @last_used && Time.now - safe_last_used > CONFIG[:reconnect_timer] * 60
             Logger.info("refreshing connection", self, notification)
             reconnect
           end

data/lib/apple_shove/demultiplexer.rb

@@ -1,21 +1,21 @@
 module AppleShove
   class Demultiplexer
-  
+
     def initialize(opts = {})
       unless opts[:max_apns_connections]
         raise ArgumentError, 'max_apns_connections must be specified'
       end
-      
+
       @max_connections = opts[:max_apns_connections].to_i
 
       @connections  = {}
       @queue        = NotificationQueue.new(CONFIG[:redis_key])
     end
-    
+
     def start
 
       while true
-    
+
         if notification = @queue.get
           conn = get_connection(notification)
           conn.pending_notifications += 1
@@ -23,38 +23,38 @@ module AppleShove
         else
           sleep 1
         end
-    
+
       end
-    
+
     end
 
     private
 
     def get_connection(notification)
       key         = APNS::NotifyConnection.generate_name(notification.p12, notification.sandbox)
-      connection  = @connections[key] 
+      connection  = @connections[key]
 
       unless connection
         retire_oldest_connection if @connections.count >= @max_connections
 
         connection        = APNS::NotifyConnection.new notification.p12, notification.sandbox
         @connections[key] = connection
-        Logger.info "created connection to APNS (#{@connections.count} total)", connection  
+        Logger.info "created connection to APNS (#{@connections.count} total)", connection
       end
-    
+
       connection
     end
-    
+
     def retire_oldest_connection
-      if oldest = @connections.min_by { |_k, v| v.last_used }
+      if oldest = @connections.min_by { |_k, v| v.safe_last_used }
         key, conn = oldest[0], oldest[1]
         conn_name = conn.name
         @connections.delete key
         conn.shutdown
-        
+
         Logger.info "destroyed connection to APNS (#{@connections.count} total)", conn_name
       end
     end
-    
+
   end
 end

data/lib/apple_shove/version.rb

@@ -1,3 +1,3 @@
 module AppleShove
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple_shove
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Taylor Boyko