lead_zeppelin 0.1.6 → 0.1.7

data/lead_zeppelin.gemspec

@@ -16,5 +16,4 @@ Gem::Specification.new do |gem|
   gem.version       = LeadZeppelin::VERSION
   gem.add_dependency 'multi_json'
   gem.add_dependency 'json'
-  gem.add_dependency 'connection_pool'
 end

data/lib/lead_zeppelin/apns.rb

@@ -7,10 +7,11 @@ require 'timeout'
 require 'securerandom'
 require_relative './apns/application'
 require_relative './apns/client'
+require_relative './apns/error_response'
 require_relative './apns/gateway'
+require_relative './apns/gateway_pool'
 require_relative './apns/logger'
 require_relative './apns/notification'
-require_relative './apns/error_response'
 
 module LeadZeppelin
   module APNS

data/lib/lead_zeppelin/apns/application.rb

@@ -1,8 +1,7 @@
 module LeadZeppelin
   module APNS
     class Application
-      CONNECTION_POOL_SIZE = 5
-      CONNECTION_POOL_TIMEOUT = 5
+      GATEWAY_POOL_SIZE = 3
 
       attr_reader :identifier
 
@@ -10,6 +9,8 @@ module LeadZeppelin
         @identifier = identifier
         @opts = opts
 
+        @gateway_pool = GatewayPool.new opts[:gateway_pool_size] || GATEWAY_POOL_SIZE
+
         @ssl_context = OpenSSL::SSL::SSLContext.new
 
         if opts[:p12]
@@ -24,22 +25,18 @@ module LeadZeppelin
         end
       end
 
-      def connect
-        cp_args = {size:    (@opts[:connection_pool_size] || CONNECTION_POOL_SIZE),
-                   timeout: (@opts[:connection_pool_timeout] || CONNECTION_POOL_TIMEOUT)}
-
+      def new_gateway
         begin
-          gateway_connection_pool = ConnectionPool.new(cp_args) do
-            Gateway.new @ssl_context, (@opts[:gateway_opts] || {}).merge(notification_error_block: @opts[:notification_error_block],
-                                                                         certificate_error_block:  @opts[:certificate_error_block],
-                                                                         application_identifier:   @identifier)
-          end
+          gateway = Gateway.new @ssl_context, 
+                                (@opts[:gateway_opts] || {}).merge(notification_error_block: @opts[:notification_error_block],
+                                 certificate_error_block:  @opts[:certificate_error_block],
+                                 application_identifier:   @identifier)
 
         rescue OpenSSL::SSL::SSLError => e
           if e.message =~ /alert certificate unknown/
             Logger.warn "bad certificate for #{@identifier}, failed to connect"
           end
-          
+
           if e.message =~ /alert certificate expired/
             Logger.warn "expired certificate for #{@identifier}, failed to connect"
           end
@@ -50,20 +47,22 @@ module LeadZeppelin
           else
             @opts[:certificate_error_block].call @identifier
           end
-        else
-          @gateway_connection_pool = gateway_connection_pool
         end
+        
+        gateway
       end
 
       def message(device_id, message, opts={})
-        connect if @gateway_connection_pool.nil?
-        return nil if @gateway_connection_pool.nil?
-
-        @gateway_connection_pool.with_connection do |gateway|
-          gateway.write Notification.new(device_id, message, opts)
+        if @gateway_pool.total < @gateway_pool.max
+          @gateway_pool.total += 1
+          Logger.info "adding new gateway connection for #{@identifier}"
+          gateway = new_gateway
+        else
+          gateway = @gateway_pool.pop
         end
 
-        true
+        gateway.write Notification.new(device_id, message, opts)
+        @gateway_pool.push gateway
       end
     end
   end

data/lib/lead_zeppelin/apns/client.rb

@@ -70,10 +70,12 @@ module LeadZeppelin
       def remove_application(name)
         Logger.info "removing application \"#{name}\""
         Logger.thread 'r'
+
         @semaphore.synchronize do
           deleted = @applications.delete name
-          Logger.warn "removing application \"#{name}\" failed! Name may be invalid." if deleted.nil?
         end
+
+        Logger.warn "removing application \"#{name}\" failed! Name may be invalid." if deleted.nil?
       end
 
       def message(app_name, device_id, message, opts={})

data/lib/lead_zeppelin/apns/gateway.rb

@@ -4,14 +4,13 @@ module LeadZeppelin
       HOST = 'gateway.push.apple.com'
       PORT = 2195
       DEFAULT_TIMEOUT = 10
-      DEFAULT_SELECT_WAIT = 0.5
+      DEFAULT_SELECT_WAIT = 0.3
 
       def initialize(ssl_context, opts={})
         Logger.thread 'g'
         @semaphore = Mutex.new
         @ssl_context = ssl_context
         @opts        = opts
-
         connect
       end
 
@@ -58,7 +57,7 @@ module LeadZeppelin
           error_response = @ssl_socket.read_nonblock 6
           error = ErrorResponse.new error_response, notification
 
-          Logger.warn "error: #{error.code}, #{error.identifier.to_s}, #{error.message}"
+          Logger.warn "error: #{error.code}, #{error.identifier.inspect}, #{error.message}"
           Logger.thread 'e'
 
           reconnect

data/lib/lead_zeppelin/apns/gateway_pool.rb

@@ -0,0 +1,12 @@
+module LeadZeppelin
+  module APNS
+    class GatewayPool < SizedQueue
+      attr_accessor :total
+      
+      def initialize(max)
+        @total = 0
+        super
+      end
+    end
+  end
+end

data/lib/lead_zeppelin/version.rb

@@ -1,3 +1,3 @@
 module LeadZeppelin
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lead_zeppelin
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: connection_pool
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Thread-safe, multi-application APNS client
 email:
 - kyledrake@gmail.com
@@ -78,6 +62,7 @@ files:
 - lib/lead_zeppelin/apns/client.rb
 - lib/lead_zeppelin/apns/error_response.rb
 - lib/lead_zeppelin/apns/gateway.rb
+- lib/lead_zeppelin/apns/gateway_pool.rb
 - lib/lead_zeppelin/apns/logger.rb
 - lib/lead_zeppelin/apns/notification.rb
 - lib/lead_zeppelin/version.rb