rapns 1.0.7 → 2.0.0rc1

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 2.0.0 (unreleased) ##
+
+  * Support for multiple apps.
+  * Hot Updates - add/remove apps without restart.
+  * MDM support.
+  * Removed rapns.yml in favour of command line options.
+  * Started the changelog!

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2012 Ian Leitch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,17 +1,23 @@
-# rapns [![Build Status](https://secure.travis-ci.org/ileitch/rapns.png)](http://travis-ci.org/ileitch/rapns)
+[![Build Status](https://secure.travis-ci.org/ileitch/rapns.png)](http://travis-ci.org/ileitch/rapns)
 
-Easy to use library for Apple's Push Notification Service with Rails 3.
-
-## Features
+# Features
 
 * Works with Rails 3 and Ruby 1.9 & 1.8.
-* Uses a daemon process to keep open a persistent connection to the Push Notification Service, as recommended by Apple.
-* Uses the [enhanced binary format](http://developer.apple.com/library/ios/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingWIthAPS/CommunicatingWIthAPS.html#//apple_ref/doc/uid/TP40008194-CH101-SW4) (Figure 5-2) so that delivery errors can be reported.
-* Records feedback from [The Feedback Service](http://developer.apple.com/library/mac/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingWIthAPS/CommunicatingWIthAPS.html#//apple_ref/doc/uid/TP40008194-CH101-SW3).
+* Supports multiple iOS apps.
+* [Add & remove apps](#hot-app-updates) without restarting or affecting the delivery of notifications to other apps.
+* Uses a daemon process to keep open persistent connections to the APNs, as recommended by Apple.
+* Uses the enhanced binary format so that [delivery errors can be reported](#delivery-failures).
+* Records feedback from [The Feedback Service](#delivery-failures).
 * [Airbrake](http://airbrakeapp.com/) (Hoptoad) integration.
-* Support for [dictionary `alert` properties](http://developer.apple.com/library/ios/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ApplePushService/ApplePushService.html#//apple_ref/doc/uid/TP40008194-CH100-SW1) (Table 3-2).
-* Reconnects to the APNs if connections are lost.
-* Reconnects to your database if the connect is lost.
+* Support for [dictionary `alert` properties](#assigning-a-hash-to-alert).
+* [Mobile Device Management (MDM)](#mobile-device-management)
+* Stable. Reconnects to the APNs and your database if connections are lost.
+
+### Who uses rapns?
+
+[GateGuru](http://gateguruapp.com), among others!
+
+*I'd love to hear if you use rapns - @ileitch on twitter.*
 
 ## Getting Started
 
@@ -31,53 +37,46 @@ Generate the migration, rapns.yml and migrate:
 3. Select both the certificate and private key.
 4. Right click and select `Export 2 items...`.
 5. Save the file as `cert.p12`, make sure the File Format is `Personal Information Exchange (p12)`.
-6. If you decide to set a password for your exported certificate, please read the Configuration section below.
+6. If you decide to set a password for your exported certificate, please read the 'Adding Apps' section below.
 7. Convert the certificate to a .pem, where `<environment>` should be `development` or `production`, depending on the certificate you exported.
 
     `openssl pkcs12 -nodes -clcerts -in cert.p12 -out <environment>.pem`
-      
-8. Move the .pem file into your Rails application under `config/rapns`.
-
-## Configuration
 
-Environment configuration lives in `config/rapns/rapns.yml`. For common setups you probably wont need to change this file.
+## Create an App
 
-If you want to use rapns in environments other than development or production, you will need to create an entry for it. Simply duplicate the configuration for development or production, depending on which iOS Push Certificate you wish to use.
+    app = Rapns::App.new
+    app.key = "my_app"
+    app.certificate = File.read("/path/to/development.pem")
+    app.password = "certificate password"
+    app.connections = 1
+    app.save!
 
-### Options:
+* `key` is a symbolic name to tie this app to notifications.
+* `certificate` is the contents of your PEM certificate, NOT its path on disk.
+* `password` should be left blank if you did not password protect your certificate.
+* `connections` (default: 1) the number of connections to keep open to the APNs. Consider increasing this if you are sending a large number of notifications to this app.
 
-* `push` this section contains options to configure the delivery of notifications.
-    * `host` the APNs host to connect to, either `gateway.push.apple.com` or `gateway.sandbox.push.apple.com`.
-    * `port` the APNs port. Currently `2195` for both hosts.
-    * `poll` (default: 2) Frequency in seconds to check for new notifications to deliver.
-    * `connections` (default: 3) the number of connections to keep open to the APNs. Consider increasing this if you are sending a very large number of notifications.
-    
-* `feedback` this section contains options to configure feedback checking.
-    * `host` the APNs host to connect to, either `feedback.push.apple.com` or `feedback.sandbox.push.apple.com`.
-    * `port` the APNs port. Currently `2196` for both hosts.
-    * `poll` (default: 60) Frequency in seconds to check for new feedback.
-
-* `certificate` The path to your .pem certificate, `config/rapns` is automatically checked if a relative path is given.
-* `certificate_password` (default: blank) the password you used when exporting your certificate, if any.
-* `airbrake_notify` (default: true) Enables/disables error notifications via Airbrake.
-* `pid_file` (default: blank) the file that rapns will write its process ID to. Paths are relative to your project's RAILS_ROOT unless an absolute path is given.
+The APNs environment is automatically detected from the app certificate, you do not need to configure push and feedback hosts.
 
 ## Starting the rapns Daemon
 
     cd /path/to/rails/app
-    bundle exec rapns <Rails environment>
+    bundle exec rapns <Rails environment> [options]
     
 ### Options
 
-* `--foreground` will prevent rapns from forking into a daemon.
-
-## Logging
-
-rapns logs activity to `rapns.log` in your Rails log directory. This is also printed to STDOUT when running in the foreground. When running as a daemon rapns does not print to STDOUT or STDERR.
+* `-f` `--foreground` Prevent rapns from forking into a daemon.
+* `-P N` `--db-poll N` Frequency in seconds to check for new notifications. Default: 2.
+* `-F N` `--feedback-poll N` Frequency in seconds to check for feedback. Default: 60.
+* `-e` `--no-error-checks` Disables [error checking](#immediately-when-processing-a-notification-for-delivery) after notification delivery. You may want to disable this if you are sending a very high number of notifications.
+* `-n` `--no-airbrake-notify` Disables error notifications via Airbrake.
+* `-p PATH` `--pid-file PATH` Path to write PID file. Relative to Rails root unless absolute.
+* `-b N` `--batch-size N` ActiveRecord batch size of notifications. Increase for possible higher throughput but higher memory footprint. Default: 5000.
 
 ## Sending a Notification
 
     n = Rapns::Notification.new
+    n.app = "my_app"
     n.device_token = "934f7a..."
     n.alert = "This is the message shown on the device."
     n.badge = 1
@@ -87,15 +86,32 @@ rapns logs activity to `rapns.log` in your Rails log directory. This is also pri
     n.deliver_after = 1.hour.from_now
     n.save!
 
+* `app` must match `key` on an `Rapns::App`.
 * `sound` defaults to `1.aiff`. You can either set it to a custom .aiff file, or `nil` for no sound.
 * `expiry` is the time in seconds the APNs (not rapns) will spend trying to deliver the notification to the device. The notification is discarded if it has not been delivered in this time. Default is 1 day.
 * `attributes_for_device` is the `NSDictionary` argument passed to your iOS app in either `didFinishLaunchingWithOptions` or `didReceiveRemoteNotification`.
 * `deliver_after` is not required, but may be set if you'd like to delay delivery of the notification to a specific time in the future.
 
+### Mobile Device Management
+
+    n = Rapns::Notification.new
+    n.mdm = "magic"
+    n.save!
+
 ### Assigning a Hash to alert
 
 Please refer to Apple's [documentation](http://developer.apple.com/library/ios/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/ApplePushService/ApplePushService.html#//apple_ref/doc/uid/TP40008194-CH100-SW1) (Tables 3-1 and 3-2).
 
+## Hot App Updates
+
+If you signal the rapns process with `HUP` it will synchronize with the current `Rapns::App` configurations. This includes adding an app, removing and increasing/decreasing the number of connections an app uses.
+
+This synchronization process does not pause the delivery of notifications to other apps.
+
+## Logging
+
+rapns logs activity to `rapns.log` in your Rails log directory. This is also printed to STDOUT when running in the foreground. When running as a daemon rapns does not print to STDOUT or STDERR.
+
 ## Delivery Failures
 
 The APNs provides two mechanism for delivery failure notification:
@@ -121,7 +137,7 @@ It is your responsibility to avoid creating new notifications for devices that n
 
 ## Updating rapns
 
-After updating you should run `rails g rapns` to check for any new migrations or configuration changes.
+After updating you should run `rails g rapns` to check for any new migrations.
 
 ## Wiki
 
@@ -142,4 +158,5 @@ Thank you to the following wonderful people for contributing to rapns:
 * [@blakewatters](https://github.com/blakewatters)
 * [@forresty](https://github.com/forresty)
 * [@sjmadsen](https://github.com/sjmadsen)
-* [@ivanyv](https://github.com/ivanyv)
+* [@ivanyv](https://github.com/ivanyv)
+* [@taybenlor](https://github.com/taybenlor)

data/bin/rapns

@@ -2,20 +2,33 @@
 
 require 'optparse'
 require 'rapns'
-require 'rapns/daemon'
 
-foreground = false
 environment = ARGV[0]
+
+config = Struct.new(:foreground, :push_poll, :feedback_poll, :airbrake_notify, :check_for_errors, :pid_file, :batch_size).new
+config.foreground = false
+config.push_poll = 2
+config.feedback_poll = 60
+config.airbrake_notify = true
+config.check_for_errors = true
+config.batch_size = 5000
+
 banner = 'Usage: rapns <Rails environment> [options]'
 ARGV.options do |opts|
   opts.banner = banner
-  opts.on('-f', '--foreground', 'Run in the foreground.') { foreground = true }
+  opts.on('-f', '--foreground', 'Run in the foreground.') { config.foreground = true }
+  opts.on('-P N', '--db-poll N', Integer, "Frequency in seconds to check for new notifications. Default: #{config.push_poll}.") { |n| config.push_poll = n }
+  opts.on('-F N', '--feedback-poll N', Integer, "Frequency in seconds to check for feedback. Default: #{config.feedback_poll}.") { |n| config.feedback_poll = n }
+  opts.on('-e', '--no-error-checks', 'Disable error checking after notification delivery.') { config.airbrake_notify = false }
+  opts.on('-n', '--no-airbrake-notify', 'Disables error notifications via Airbrake.') { config.check_for_errors = false }
+  opts.on('-p PATH', '--pid-file PATH', String, 'Path to write PID file. Relative to Rails root unless absolute.') { |path| config.pid_file = path }
+  opts.on('-b N', '--batch-size N', Integer, 'ActiveRecord notifications batch size.') { |n| config.batch_size = n }
   opts.on('-v', '--version', 'Print this version of rapns.') { puts "rapns #{Rapns::VERSION}"; exit }
   opts.on('-h', '--help', 'You\'re looking at it.') { puts opts; exit }
   opts.parse!
 end
 
-if environment.nil?
+if environment.nil? || environment =~ /^-/
   puts banner
   exit 1
 end
@@ -23,6 +36,11 @@ end
 ENV['RAILS_ENV'] = environment
 load 'config/environment.rb'
 
+require 'rapns/daemon'
 require 'rapns/patches'
 
-Rapns::Daemon.start(environment, foreground)
+if config.pid_file && !Pathname.new(config.pid_file).absolute?
+  config.pid_file = File.join(Rails.root, config.pid_file)
+end
+
+Rapns::Daemon.start(environment, config)

data/lib/generators/rapns_generator.rb

@@ -13,10 +13,8 @@ class RapnsGenerator < Rails::Generators::Base
     add_rapns_migration('create_rapns_notifications')
     add_rapns_migration('create_rapns_feedback')
     add_rapns_migration('add_alert_is_json_to_rapns_notifications')
-  end
-
-  def copy_config
-    copy_file 'rapns.yml', 'config/rapns/rapns.yml'
+    add_rapns_migration('add_app_to_rapns')
+    add_rapns_migration('create_rapns_apps')
   end
 
   protected

data/lib/generators/templates/add_app_to_rapns.rb

@@ -0,0 +1,11 @@
+class AddAppToRapns < ActiveRecord::Migration
+  def self.up
+    add_column :rapns_notifications, :app, :string, :null => true
+    add_column :rapns_feedback, :app, :string, :null => true
+  end
+
+  def self.down
+    remove_column :rapns_notifications, :app
+    remove_column :rapns_feedback, :app
+  end
+end

data/lib/generators/templates/create_rapns_apps.rb

@@ -0,0 +1,15 @@
+class CreateRapnsApps < ActiveRecord::Migration
+  def self.up
+    create_table :rapns_apps do |t|
+      t.string    :key,             :null => false
+      t.text      :certificate,     :null => false
+      t.string    :password,        :null => true
+      t.integer   :connections,     :null => false, :default => 1
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :rapns_apps
+  end
+end

data/lib/rapns/app.rb

@@ -0,0 +1,9 @@
+module Rapns
+  class App < ActiveRecord::Base
+    self.table_name = 'rapns_apps'
+
+    validates :key, :presence => true, :uniqueness => true
+    validates :certificate, :presence => true
+    validates_numericality_of :connections, :greater_than => 0, :only_integer => true
+  end
+end

data/lib/rapns/daemon/app_runner.rb

@@ -0,0 +1,131 @@
+module Rapns
+	module Daemon
+    class AppRunner
+      HOSTS = {
+        :production => {
+          :push => ['gateway.push.apple.com', 2195],
+          :feedback => ['feedback.push.apple.com', 2196]
+        },
+        :development => {
+          :push => ['gateway.sandbox.push.apple.com', 2195],
+          :feedback => ['feedback.sandbox.push.apple.com', 2196]
+        }
+      }
+
+      class << self
+        attr_reader :all
+      end
+
+      @all = {}
+
+      def self.ready
+        ready = []
+        @all.each { |app, runner| ready << app if runner.ready? }
+        ready
+      end
+
+      def self.deliver(notification)
+        if app = @all[notification.app]
+          app.deliver(notification)
+        else
+          Rapns::Daemon.logger.error("No such app '#{notification.app}' for notification #{notification.id}.")
+        end
+      end
+
+      def self.sync
+        apps = Rapns::App.all
+        apps.each do |app|
+          if @all[app.key]
+            @all[app.key].sync(app)
+          else
+            environment = detect_environment(app)
+            next unless environment
+            push_host, push_port = HOSTS[environment][:push]
+            feedback_host, feedback_port = HOSTS[environment][:feedback]
+            feedback_poll = Rapns::Daemon.config.feedback_poll
+            runner = AppRunner.new(app, push_host, push_port, feedback_host, feedback_port, feedback_poll)
+            runner.start
+            @all[app.key] = runner
+          end
+        end
+
+        removed = @all.keys - apps.map(&:key)
+        removed.each { |key| @all.delete(key).stop }
+      end
+
+      def self.stop
+        @all.values.map(&:stop)
+      end
+
+      def self.debug
+        @all.values.map(&:debug)
+      end
+
+      def self.detect_environment(app)
+        if app.certificate =~ /Apple Development IOS Push Services/i
+          :development
+        elsif app.certificate =~ /Apple Production IOS Push Services/i
+          :production
+        else
+          Rapns::Daemon.logger.error("Could not detect environment for app '#{app.key}'.")
+          nil
+        end
+      end
+
+      def initialize(app, push_host, push_port, feedback_host, feedback_port, feedback_poll)
+        @app = app
+        @push_host = push_host
+        @push_port = push_port
+        @feedback_host = feedback_host
+        @feedback_port = feedback_port
+        @feedback_poll = feedback_poll
+
+        @queue = DeliveryQueue.new
+        @feedback_receiver = nil
+        @handlers = []
+      end
+
+      def start
+        @feedback_receiver = FeedbackReceiver.new(@app.key, @feedback_host, @feedback_port, @feedback_poll, @app.certificate, @app.password)
+        @feedback_receiver.start
+
+        @app.connections.times { @handlers << start_handler }
+      end
+
+      def deliver(notification)
+        @queue.push(notification)
+      end
+
+      def stop
+        @handlers.map(&:stop)
+        @feedback_receiver.stop if @feedback_receiver
+      end
+
+      def sync(app)
+        @app = app
+        diff = @handlers.size - app.connections
+        if diff > 0
+          diff.times { @handlers.pop.stop }
+        else
+          diff.abs.times { @handlers << start_handler }
+        end
+      end
+
+      def ready?
+        @queue.notifications_processed?
+      end
+
+      def debug
+        Rapns::Daemon.logger.info("\nAppRunner State:\n#{@app.key}:\n  handlers: #{@handlers.size}\n  backlog: #{@queue.size}\n  ready: #{ready?}")
+      end
+
+      protected
+
+      def start_handler
+        handler = DeliveryHandler.new(@queue, @app.key, @push_host, @push_port, @app.certificate, @app.password)
+        handler.start
+        handler
+      end
+    end
+	end
+end

data/lib/rapns/daemon/connection.rb

@@ -9,10 +9,12 @@ module Rapns
         30.minutes
       end
 
-      def initialize(name, host, port)
+      def initialize(name, host, port, certificate, password)
         @name = name
         @host = host
         @port = port
+        @certificate = certificate
+        @password = password
         written
       end
 
@@ -89,8 +91,8 @@ module Rapns
 
       def setup_ssl_context
         ssl_context = OpenSSL::SSL::SSLContext.new
-        ssl_context.key = OpenSSL::PKey::RSA.new(Rapns::Daemon.certificate.certificate, Rapns::Daemon.configuration.certificate_password)
-        ssl_context.cert = OpenSSL::X509::Certificate.new(Rapns::Daemon.certificate.certificate)
+        ssl_context.key = OpenSSL::PKey::RSA.new(@certificate, @password)
+        ssl_context.cert = OpenSSL::X509::Certificate.new(@certificate)
         ssl_context
       end
 

data/lib/rapns/daemon/delivery_handler.rb

@@ -3,8 +3,7 @@ module Rapns
     class DeliveryHandler
       include DatabaseReconnectable
 
-      STOP = 0x666
-      SELECT_TIMEOUT = 0.5
+      SELECT_TIMEOUT = 0.2
       ERROR_TUPLE_BYTES = 6
       APN_ERRORS = {
         1 => "Processing error",
@@ -20,17 +19,16 @@ module Rapns
 
       attr_reader :name
 
-      def initialize(i)
-        @name = "DeliveryHandler #{i}"
-        host = Rapns::Daemon.configuration.push.host
-        port = Rapns::Daemon.configuration.push.port
-        @connection = Connection.new(@name, host, port)
+      def initialize(queue, name, host, port, certificate, password)
+        @queue = queue
+        @name = "DeliveryHandler:#{name}"
+        @connection = Connection.new(@name, host, port, certificate, password)
       end
 
       def start
         @connection.connect
 
-        Thread.new do
+        @thread = Thread.new do
           loop do
             break if @stop
             handle_next_notification
@@ -40,7 +38,7 @@ module Rapns
 
       def stop
         @stop = true
-        Rapns::Daemon.delivery_queue.push(STOP)
+        @queue.wakeup(@thread)
       end
 
       protected
@@ -48,7 +46,7 @@ module Rapns
       def deliver(notification)
         begin
           @connection.write(notification.to_binary)
-          check_for_error
+          check_for_error if Rapns::Daemon.config.check_for_errors
 
           with_database_reconnect_and_retry do
             notification.delivered = true
@@ -56,7 +54,7 @@ module Rapns
             notification.save!(:validate => false)
           end
 
-          Rapns::Daemon.logger.info("Notification #{notification.id} delivered to #{notification.device_token}")
+          Rapns::Daemon.logger.info("[#{@name}] #{notification.id} sent to #{notification.device_token}")
         rescue Rapns::DeliveryError, Rapns::DisconnectionError => error
           handle_delivery_error(notification, error)
           raise
@@ -98,9 +96,9 @@ module Rapns
       end
 
       def handle_next_notification
-        notification = Rapns::Daemon.delivery_queue.pop
-
-        if notification == STOP
+        begin
+          notification = @queue.pop
+        rescue DeliveryQueue::WakeupError
           @connection.close
           return
         end
@@ -110,7 +108,7 @@ module Rapns
         rescue StandardError => e
           Rapns::Daemon.logger.error(e)
         ensure
-          Rapns::Daemon.delivery_queue.notification_processed
+          @queue.notification_processed
         end
       end
     end

data/lib/rapns/daemon/delivery_handler_pool.rb

@@ -1,19 +1,17 @@
 module Rapns
   module Daemon
-    class DeliveryHandlerPool < Pool
-
-      protected
-
-      def new_object_for_pool(i)
-        DeliveryHandler.new(i)
+    class DeliveryHandlerPool
+      def initialize
+        @handlers = []
       end
 
-      def object_added_to_pool(object)
-        object.start
+      def <<(handler)
+        @handlers << handler
+        handler.start
       end
 
-      def object_removed_from_pool(object)
-        object.stop
+      def drain
+        @handlers.pop.stop while !@handlers.empty?
       end
     end
   end

data/lib/rapns/daemon/delivery_queue.rb

@@ -1,19 +1,51 @@
 module Rapns
   module Daemon
     class DeliveryQueue
+      class WakeupError < StandardError; end
+
       def initialize
         @mutex = Mutex.new
         @num_notifications = 0
-        @queue = Queue.new
+        @queue = []
+        @waiting = []
       end
 
       def push(notification)
-        @mutex.synchronize { @num_notifications += 1 }
-        @queue.push(notification)
+        @mutex.synchronize do
+          @num_notifications += 1
+          @queue.push(notification)
+
+          begin
+            t = @waiting.shift
+            t.wakeup if t
+          rescue ThreadError
+            retry
+          end
+        end
       end
 
       def pop
-        @queue.pop
+        @mutex.synchronize do
+          while true
+            if @queue.empty?
+              @waiting.push Thread.current
+              @mutex.sleep
+            else
+              return @queue.shift
+            end
+          end
+        end
+      end
+
+      def wakeup(thread)
+        @mutex.synchronize do
+          t = @waiting.delete(thread)
+          t.raise WakeupError if t
+        end
+      end
+
+      def size
+        @mutex.synchronize { @queue.size }
       end
 
       def notification_processed

data/lib/rapns/daemon/feedback_receiver.rb

@@ -1,32 +1,39 @@
 module Rapns
   module Daemon
     class FeedbackReceiver
-      extend InterruptibleSleep
+      include InterruptibleSleep
 
       FEEDBACK_TUPLE_BYTES = 38
 
-      def self.start
+      def initialize(app, host, port, poll, certificate, password)
+        @app = app
+        @host = host
+        @port = port
+        @poll = poll
+        @certificate = certificate
+        @password = password
+      end
+
+      def start
         @thread = Thread.new do
           loop do
             break if @stop
             check_for_feedback
-            interruptible_sleep Rapns::Daemon.configuration.feedback.poll
+            interruptible_sleep @poll
           end
         end
       end
 
-      def self.stop
+      def stop
         @stop = true
         interrupt_sleep
         @thread.join if @thread
       end
 
-      def self.check_for_feedback
+      def check_for_feedback
         connection = nil
         begin
-          host = Rapns::Daemon.configuration.feedback.host
-          port = Rapns::Daemon.configuration.feedback.port
-          connection = Connection.new("FeedbackReceiver", host, port)
+          connection = Connection.new("FeedbackReceiver:#{@app}", @host, @port, @certificate, @password)
           connection.connect
 
           while tuple = connection.read(FEEDBACK_TUPLE_BYTES)
@@ -42,15 +49,15 @@ module Rapns
 
       protected
 
-      def self.parse_tuple(tuple)
+      def parse_tuple(tuple)
         failed_at, _, device_token = tuple.unpack("N1n1H*")
         [Time.at(failed_at).utc, device_token]
       end
 
-      def self.create_feedback(failed_at, device_token)
+      def create_feedback(failed_at, device_token)
         formatted_failed_at = failed_at.strftime("%Y-%m-%d %H:%M:%S UTC")
-        Rapns::Daemon.logger.info("[FeedbackReceiver] Delivery failed at #{formatted_failed_at} for #{device_token}")
-        Rapns::Feedback.create!(:failed_at => failed_at, :device_token => device_token)
+        Rapns::Daemon.logger.info("[FeedbackReceiver:#{@app}] Delivery failed at #{formatted_failed_at} for #{device_token}")
+        Rapns::Feedback.create!(:failed_at => failed_at, :device_token => device_token, :app => @app)
       end
     end
   end