Merge pull request #31 from Papercloud/fix/houston-threading

Fix/houston threading

Author: antonivanopoulos

README.md

@@ -53,17 +53,6 @@ wwtd
 ## APNS providers
 By default, we use [Houston](https://github.com/nomad/houston/) to deliver push notifications via APNS from the server.
 
-The initialiser for `notify_user` contains the following configuration when delivering via Houston:
-```
-# Number of connections Houston will maintain to APNS:
-config.connection_pool_size = 3
-
-# Time in seconds Houston will wait for a free connection before failing:
-config.connection_pool_timeout = 300
-```
-
-We maintain persistent connections to APNS via background workers, and these values will allow you to configure how many connections the workers maintain, as well as the amount of time to wait for an idle connection before timing out.
-
 You also need to provide exported versions of your push notification certificate and key as .pem files, these instructions come from the [APN on Rails](https://github.com/PRX/apn_on_rails) project on how to do that:
 
 Once you have the certificate from Apple for your application, export your key

app/models/notify_user/apn_connection.rb

@@ -1,6 +1,10 @@
 module NotifyUser
   class APNConnection
 
+    POOL = ConnectionPool.new(size: ENV['APNS_CONNECTION_POOL_SIZE'] || 1, timeout: ENV['APNS_CONNECTION_TIMEOUT'] || 30) {
+      APNConnection.new
+    }
+
     def initialize
       connection
     end

app/models/notify_user/apns.rb

@@ -5,9 +5,8 @@ module NotifyUser
   class Apns < Push
     NO_ERROR = -42
     INVALID_TOKEN_ERROR = 8
-    CONNECTION = APNConnection.new
 
-    attr_accessor :push_options
+    attr_accessor :push_options, :apn_connection
 
     def initialize(notifications, devices, options)
       super(notifications, devices, options)
@@ -17,19 +16,22 @@ def initialize(notifications, devices, options)
     end
 
     def push
-      send_notifications
+      APNConnection::POOL.with do |apn_conn|
+        @apn_connection = apn_conn
+        send_notifications
+      end
     end
 
     private
 
     attr_accessor :devices
 
     def connection
-      CONNECTION.connection
+      apn_connection.connection
     end
 
     def reset_connection
-      CONNECTION.reset
+      apn_connection.reset
     end
 
     def setup_options

lib/generators/notify_user/install/templates/initializer.rb

@@ -14,11 +14,4 @@
 
   # Provider for APNS:
   config.apns_provider = :houston
-
-  # Number of connections Houston will maintain to APNS:
-  config.connection_pool_size = 3
-
-  # Time in seconds Houston will wait for a free connection before failing:
-  config.connection_pool_timeout = 300
-
 end

lib/notify_user.rb

@@ -20,14 +20,6 @@ module NotifyUser
   mattr_accessor :apns_provider
   @@apns_provider = nil
 
-  # Number of connections Houston will maintain to APNS:
-  mattr_accessor :connection_pool_size
-  @@connection_pool_size = nil
-
-  # Time in seconds Houston will wait for a free connection before failing:
-  mattr_accessor :connection_pool_timeout
-  @@connection_pool_timeout = nil
-
   # Used to set up NotifyUser from the initializer.
   def self.setup
     yield self