rapns 3.1.0-java → 3.2.0-java

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.2.0 (Apr 1, 2013)
+  * Rapns.apns_feedback for one time feedback retrieval. Rapns.push no longer checks for feedback (#117, #105).
+  * Lazily connect to the APNs only when a notification is to be delivered (#111).
+  * Ensure all notifications are sent when using Rapns.push (#107).
+  * Fix issue with running Rapns.push more than once in the same process (#106).
+
 ## 3.1.0 (Jan 26, 2013)
   * Rapns.reflect API for fine-grained introspection.
   * Rapns.embed API for embedding Rapns into an existing process.

data/README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://secure.travis-ci.org/ileitch/rapns.png?branch=master)](http://travis-ci.org/ileitch/rapns)
+[![Code Climate](https://codeclimate.com/github/ileitch/rapns.png)](https://codeclimate.com/github/ileitch/rapns)
 
 ### Rapns - Professional grade APNs and GCM for Ruby.
 
@@ -8,13 +9,13 @@
 * Designed for uptime - signal -HUP to add, update apps.
 * Stable - reconnects database and network connections when lost.
 * Run as a daemon or inside an existing process.
-* Use in a scheduler for low-workload deployments ([Push API](rapns/wiki/Push-API)).
-* Reflection API for fine-grained instrumentation ([Reflection API](rapns/wiki/Relfection-API)).
+* Use in a scheduler for low-workload deployments ([Push API](https://github.com/ileitch/rapns/wiki/Push-API)).
+* Reflection API for fine-grained instrumentation ([Reflection API](https://github.com/ileitch/rapns/wiki/Relfection-API)).
 * Works with MRI, JRuby, Rubinius 1.8 and 1.9.
 * [Airbrake](http://airbrakeapp.com/) integration.
-* Built with a love for Open Source :)
+* Built with love.
 
-#### 2.x users please read [upgrading from 2.x to 3.0](rapns/wiki/Upgrading-from-version-2.x-to-3.0)
+#### 2.x users please read [upgrading from 2.x to 3.0](https://github.com/ileitch/rapns/wiki/Upgrading-from-version-2.x-to-3.0)
 
 ### Who uses Rapns?
 
@@ -40,7 +41,7 @@ Generate the migrations, 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. Convert the certificate to a .pem, where `<environment>` should be `development` or `production`, depending on the certificate you exported.
+6. Convert the certificate to a .pem, where `<environment>` should be `sandbox` or `production`, depending on the certificate you exported.
 
 Without a password:
 
@@ -56,8 +57,8 @@ With a password:
 ```ruby
 app = Rapns::Apns::App.new
 app.name = "ios_app"
-app.certificate = File.read("/path/to/development.pem")
-app.environment = "development"
+app.certificate = File.read("/path/to/sandbox.pem")
+app.environment = "sandbox"
 app.password = "certificate password"
 app.connections = 1
 app.save!
@@ -100,13 +101,17 @@ As a daemon:
     cd /path/to/rails/app
     rapns <Rails environment> [options]
 
-Inside an existing process:
+Inside an existing process (see [Embedding API](https://github.com/ileitch/rapns/wiki/Embedding-API)):
 
     Rapns.embed
 
 *Please note that only ever a single instance of Rapns should be running.*
 
-See [Configuration](rapns/wiki/Configuration) for a list of options, or run `rapns --help`.
+In a scheduler:
+
+    Rapns.push
+
+See [Configuration](https://github.com/ileitch/rapns/wiki/Configuration) for a list of options, or run `rapns --help`.
 
 ## Updating Rapns
 
@@ -115,19 +120,20 @@ After updating you should run `rails g rapns` to check for any new migrations.
 ## Wiki
 
 ### General
-* [Configuration](rapns/wiki/Configuration)
-* [Upgrading from 2.x to 3.0](rapns/wiki/Upgrading-from-version-2.x-to-3.0)
-* [Deploying to Heroku](rapns/wiki/Heroku)
-* [Hot App Updates](rapns/wiki/Hot-App-Updates)
-* [Reflection API](rapns/wiki/Reflection-API)
-* [Push API](rapns/wiki/Push-API)
-* [Embedding API](rapns/wiki/Embedding-API)
+* [Configuration](https://github.com/ileitch/rapns/wiki/Configuration)
+* [Upgrading from 2.x to 3.0](https://github.com/ileitch/rapns/wiki/Upgrading-from-version-2.x-to-3.0)
+* [Deploying to Heroku](https://github.com/ileitch/rapns/wiki/Heroku)
+* [Hot App Updates](https://github.com/ileitch/rapns/wiki/Hot-App-Updates)
+* [Signals](https://github.com/ileitch/rapns/wiki/Signals)
+* [Reflection API](https://github.com/ileitch/rapns/wiki/Reflection-API)
+* [Push API](https://github.com/ileitch/rapns/wiki/Push-API)
+* [Embedding API](https://github.com/ileitch/rapns/wiki/Embedding-API)
 
 ### APNs
-* [Advanced APNs Features](rapns/wiki/Advanced-APNs-Features)
-* [APNs Delivery Failure Handling](rapns/wiki/APNs-Delivery-Failure-Handling)
-* [Why open multiple connections to the APNs?](rapns/wiki/Why-open-multiple-connections-to-the-APNs%3F)
-* [Silent failures might be dropped connections](rapns/wiki/Dropped-connections)
+* [Advanced APNs Features](https://github.com/ileitch/rapns/wiki/Advanced-APNs-Features)
+* [APNs Delivery Failure Handling](https://github.com/ileitch/rapns/wiki/APNs-Delivery-Failure-Handling)
+* [Why open multiple connections to the APNs?](https://github.com/ileitch/rapns/wiki/Why-open-multiple-connections-to-the-APNs%3F)
+* [Silent failures might be dropped connections](https://github.com/ileitch/rapns/wiki/Dropped-connections)
 
 ### GCM
 

data/config/database.yml

@@ -37,3 +37,12 @@ jdbcmysql:
   username: rapns_test
   password: ""
   encoding: utf8
+
+jdbch2:
+  adapter: h2
+  url: jdbc:h2:file:/tmp/rapns_test;AUTO_SERVER=TRUE
+  username: rapns_test
+  password: ""
+  pool: 128
+  timeout: 5000
+  encoding: utf8

data/lib/generators/templates/add_gcm.rb

@@ -17,12 +17,12 @@ class AddGcm < ActiveRecord::Migration
     AddGcm::Rapns::Notification.update_all :type => 'Rapns::Apns::Notification'
     AddGcm::Rapns::App.update_all :type => 'Rapns::Apns::App'
 
-    change_column_null :rapns_notifications, :type, false
-    change_column_null :rapns_apps, :type, false
-    change_column_null :rapns_notifications, :device_token, true
-    change_column_null :rapns_notifications, :expiry, true
-    change_column_null :rapns_apps, :environment, true
-    change_column_null :rapns_apps, :certificate, true
+    change_column :rapns_notifications, :type, :string, :null => false
+    change_column :rapns_apps, :type, :string, :null => false
+    change_column :rapns_notifications, :device_token, :string, { :null => true, :limit => 64 }
+    change_column :rapns_notifications, :expiry, :integer, { :null => true, :default => 1.day.to_i }
+    change_column :rapns_apps, :environment, :string, :null => true
+    change_column :rapns_apps, :certificate, :text, :null => true
 
     change_column :rapns_notifications, :error_description, :text
     change_column :rapns_notifications, :sound, :string, :default => 'default'
@@ -47,7 +47,7 @@ class AddGcm < ActiveRecord::Migration
       Rapns::Notification.update_all(['app_id = ?', app.id], ['app = ?', app.name])
     end
 
-    change_column_null :rapns_notifications, :app_id, false
+    change_column :rapns_notifications, :app_id, :integer, :null => false
     remove_column :rapns_notifications, :app
 
     remove_index :rapns_notifications, :name => "index_rapns_notifications_multi"
@@ -60,10 +60,10 @@ class AddGcm < ActiveRecord::Migration
     remove_column :rapns_notifications, :type
     remove_column :rapns_apps, :type
 
-    change_column_null :rapns_notifications, :device_token, false
-    change_column_null :rapns_notifications, :expiry, false
-    change_column_null :rapns_apps, :environment, false
-    change_column_null :rapns_apps, :certificate, false
+    change_column :rapns_notifications, :device_token, :string, { :null => false, :limit => 64 }
+    change_column :rapns_notifications, :expiry, :integer, { :null => false, :default => 1.day.to_i }
+    change_column :rapns_apps, :environment, :string, :null => false
+    change_column :rapns_apps, :certificate, :text, :null => false
 
     change_column :rapns_notifications, :error_description, :string
     change_column :rapns_notifications, :sound, :string, :default => '1.aiff'
@@ -87,7 +87,7 @@ class AddGcm < ActiveRecord::Migration
       Rapns::Notification.update_all(['app = ?', app.key], ['app_id = ?', app.id])
     end
 
-    change_column_null :rapns_notifications, :key, false
+    change_column :rapns_notifications, :key, :string, :null => false
     remove_column :rapns_notifications, :app_id
 
     remove_index :rapns_notifications, :name => "index_rapns_notifications_multi"

data/lib/rapns/apns/app.rb

@@ -1,8 +1,8 @@
 module Rapns
   module Apns
     class App < Rapns::App
-      validates :environment, :presence => true, :inclusion => { :in => %w(development production) }
+      validates :environment, :presence => true, :inclusion => { :in => %w(development production sandbox) }
       validates :certificate, :presence => true
     end
   end
-end
+end

data/lib/rapns/apns_feedback.rb

@@ -0,0 +1,12 @@
+module Rapns
+  def self.apns_feedback
+    Rapns.require_for_daemon
+
+    Rapns::Apns::App.all.each do |app|
+      receiver = Rapns::Daemon::Apns::FeedbackReceiver.new(app, 0)
+      receiver.check_for_feedback
+    end
+
+    nil
+  end
+end

data/lib/rapns/daemon/apns/app_runner.rb

@@ -2,24 +2,14 @@ module Rapns
   module Daemon
     module Apns
       class AppRunner < Rapns::Daemon::AppRunner
-        ENVIRONMENTS = {
-          :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]
-          }
-        }
-
         protected
 
         def started
-          poll = Rapns.config[:feedback_poll]
-          host, port = ENVIRONMENTS[app.environment.to_sym][:feedback]
-          @feedback_receiver = FeedbackReceiver.new(app, host, port, poll)
-          @feedback_receiver.start
+          unless Rapns.config.push
+            poll = Rapns.config.feedback_poll
+            @feedback_receiver = FeedbackReceiver.new(app, poll)
+            @feedback_receiver.start
+          end
         end
 
         def stopped
@@ -27,8 +17,7 @@ module Rapns
         end
 
         def new_delivery_handler
-          push_host, push_port = ENVIRONMENTS[app.environment.to_sym][:push]
-          DeliveryHandler.new(app, push_host, push_port)
+          DeliveryHandler.new(app)
         end
       end
     end

data/lib/rapns/daemon/apns/connection.rb

@@ -53,7 +53,7 @@ module Rapns
             retry_count += 1;
 
             if retry_count == 1
-              Rapns::Daemon.logger.error("[#{@app.name}] Lost connection to #{@host}:#{@port} (#{e.class.name}), reconnecting...")
+              Rapns.logger.error("[#{@app.name}] Lost connection to #{@host}:#{@port} (#{e.class.name}), reconnecting...")
               reflect(:apns_connection_lost, @app, e)
             end
 
@@ -75,7 +75,7 @@ module Rapns
         protected
 
         def reconnect_idle
-          Rapns::Daemon.logger.info("[#{@app.name}] Idle period exceeded, reconnecting...")
+          Rapns.logger.info("[#{@app.name}] Idle period exceeded, reconnecting...")
           reconnect
         end
 
@@ -107,7 +107,7 @@ module Rapns
           ssl_socket = OpenSSL::SSL::SSLSocket.new(tcp_socket, @ssl_context)
           ssl_socket.sync = true
           ssl_socket.connect
-          Rapns::Daemon.logger.info("[#{@app.name}] Connected to #{@host}:#{@port}")
+          Rapns.logger.info("[#{@app.name}] Connected to #{@host}:#{@port}")
           [tcp_socket, ssl_socket]
         end
       end

data/lib/rapns/daemon/apns/delivery.rb

@@ -27,7 +27,7 @@ module Rapns
             @connection.write(@notification.to_binary)
             check_for_error if Rapns.config.check_for_errors
             mark_delivered
-            Rapns::Daemon.logger.info("[#{@app.name}] #{@notification.id} sent to #{@notification.device_token}")
+            Rapns.logger.info("[#{@app.name}] #{@notification.id} sent to #{@notification.device_token}")
           rescue Rapns::DeliveryError, Rapns::Apns::DisconnectionError => error
             mark_failed(error.code, error.description)
             raise
@@ -50,7 +50,7 @@ module Rapns
             end
 
             begin
-              Rapns::Daemon.logger.error("[#{@app.name}] Error received, reconnecting...")
+              Rapns.logger.error("[#{@app.name}] Error received, reconnecting...")
               @connection.reconnect
             ensure
               raise error if error

data/lib/rapns/daemon/apns/delivery_handler.rb

@@ -2,18 +2,32 @@ module Rapns
   module Daemon
     module Apns
       class DeliveryHandler < Rapns::Daemon::DeliveryHandler
-        def initialize(app, host, port)
+        HOSTS = {
+          :production  => ['gateway.push.apple.com', 2195],
+          :development => ['gateway.sandbox.push.apple.com', 2195], # deprecated
+          :sandbox     => ['gateway.sandbox.push.apple.com', 2195]
+        }
+
+        def initialize(app)
           @app = app
-          @connection = Connection.new(@app, host, port)
-          @connection.connect
+          @host, @port = HOSTS[@app.environment.to_sym]
         end
 
         def deliver(notification)
-          Rapns::Daemon::Apns::Delivery.perform(@app, @connection, notification)
+          Rapns::Daemon::Apns::Delivery.perform(@app, connection, notification)
         end
 
         def stopped
-          @connection.close
+          @connection.close if @connection
+        end
+
+        protected
+
+        def connection
+          return @connection if defined? @connection
+          connection = Connection.new(@app, @host, @port)
+          connection.connect
+          @connection = connection
         end
       end
     end

data/lib/rapns/daemon/apns/feedback_receiver.rb

@@ -7,11 +7,15 @@ module Rapns
         include DatabaseReconnectable
 
         FEEDBACK_TUPLE_BYTES = 38
+        HOSTS = {
+          :production  => ['feedback.push.apple.com', 2196],
+          :development => ['feedback.sandbox.push.apple.com', 2196], # deprecated
+          :sandbox     => ['feedback.sandbox.push.apple.com', 2196]
+        }
 
-        def initialize(app, host, port, poll)
+        def initialize(app, poll)
           @app = app
-          @host = host
-          @port = port
+          @host, @port = HOSTS[@app.environment.to_sym]
           @poll = poll
           @certificate = app.certificate
           @password = app.password
@@ -44,7 +48,7 @@ module Rapns
               create_feedback(timestamp, device_token)
             end
           rescue StandardError => e
-            Rapns::Daemon.logger.error(e)
+            Rapns.logger.error(e)
           ensure
             connection.close if connection
           end
@@ -60,7 +64,7 @@ module Rapns
         def create_feedback(failed_at, device_token)
           formatted_failed_at = failed_at.strftime("%Y-%m-%d %H:%M:%S UTC")
           with_database_reconnect_and_retry do
-            Rapns::Daemon.logger.info("[#{@app.name}] [FeedbackReceiver] Delivery failed at #{formatted_failed_at} for #{device_token}.")
+            Rapns.logger.info("[#{@app.name}] [FeedbackReceiver] Delivery failed at #{formatted_failed_at} for #{device_token}.")
             feedback = Rapns::Apns::Feedback.create!(:failed_at => failed_at, :device_token => device_token, :app => @app)
             reflect(:apns_feedback, feedback)
 
@@ -68,7 +72,7 @@ module Rapns
             begin
               Rapns.config.apns_feedback_callback.call(feedback) if Rapns.config.apns_feedback_callback
             rescue StandardError => e
-              Rapns::Daemon.logger.error(e)
+              Rapns.logger.error(e)
             end
           end
         end

data/lib/rapns/daemon/app_runner.rb

@@ -11,7 +11,7 @@ module Rapns
         if app = runners[notification.app_id]
           app.enqueue(notification)
         else
-          Rapns::Daemon.logger.error("No such app '#{notification.app_id}' for notification #{notification.id}.")
+          Rapns.logger.error("No such app '#{notification.app_id}' for notification #{notification.id}.")
         end
       end
 
@@ -31,8 +31,8 @@ module Rapns
             runner.start
             runners[app.id] = runner
           rescue StandardError => e
-            Rapns::Daemon.logger.error("[#{app.name}] Exception raised during startup. Notifications will not be delivered for this app.")
-            Rapns::Daemon.logger.error(e)
+            Rapns.logger.error("[#{app.name}] Exception raised during startup. Notifications will not be delivered for this app.")
+            Rapns.logger.error(e)
           end
         end
       end
@@ -44,6 +44,7 @@ module Rapns
 
       def self.stop
         runners.values.map(&:stop)
+        runners.clear
       end
 
       def self.debug
@@ -51,7 +52,11 @@ module Rapns
       end
 
       def self.idle
-        runners.values.select { |runner| runner.idle? }
+        runners.values.select(&:idle?)
+      end
+
+      def self.wait
+        sleep 0.1 while !runners.values.all?(&:idle?)
       end
 
       attr_reader :app
@@ -69,12 +74,13 @@ module Rapns
       def start
         app.connections.times { handlers << start_handler }
         started
-        Rapns::Daemon.logger.info("[#{app.name}] Started, #{handlers_str}.")
+        Rapns.logger.info("[#{app.name}] Started, #{handlers_str}.")
       end
 
       def stop
         handlers.map(&:stop)
         stopped
+        handlers.clear
       end
 
       def enqueue(notification)
@@ -87,10 +93,10 @@ module Rapns
         return if diff == 0
         if diff > 0
           diff.times { decrement_handlers }
-          Rapns::Daemon.logger.info("[#{app.name}] Stopped #{handlers_str(diff)}. #{handlers_str} remaining.")
+          Rapns.logger.info("[#{app.name}] Stopped #{handlers_str(diff)}. #{handlers_str} remaining.")
         else
           diff.abs.times { increment_handlers }
-          Rapns::Daemon.logger.info("[#{app.name}] Started #{handlers_str(diff)}. #{handlers_str} remaining.")
+          Rapns.logger.info("[#{app.name}] Started #{handlers_str(diff)}. #{handlers_str} remaining.")
         end
       end
 
@@ -103,7 +109,7 @@ module Rapns
       end
 
       def debug
-        Rapns::Daemon.logger.info <<-EOS
+        Rapns.logger.info <<-EOS
 
 #{@app.name}:
   handlers: #{num_handlers}

data/lib/rapns/daemon/database_reconnectable.rb

@@ -16,27 +16,27 @@ module Rapns
             yield
           end
         rescue *ADAPTER_ERRORS => e
-          Rapns::Daemon.logger.error(e)
+          Rapns.logger.error(e)
           database_connection_lost
           retry
         end
       end
 
       def database_connection_lost
-        Rapns::Daemon.logger.warn("Lost connection to database, reconnecting...")
+        Rapns.logger.warn("Lost connection to database, reconnecting...")
         attempts = 0
         loop do
           begin
-            Rapns::Daemon.logger.warn("Attempt #{attempts += 1}")
+            Rapns.logger.warn("Attempt #{attempts += 1}")
             reconnect_database
             check_database_is_connected
             break
           rescue *ADAPTER_ERRORS => e
-            Rapns::Daemon.logger.error(e, :airbrake_notify => false)
+            Rapns.logger.error(e, :airbrake_notify => false)
             sleep_to_avoid_thrashing
           end
         end
-        Rapns::Daemon.logger.warn("Database reconnected")
+        Rapns.logger.warn("Database reconnected")
       end
 
       def reconnect_database
@@ -54,4 +54,4 @@ module Rapns
       end
     end
   end
-end
+end

data/lib/rapns/daemon/delivery_handler.rb

@@ -39,7 +39,7 @@ module Rapns
           deliver(notification)
           reflect(:notification_delivered, notification)
         rescue StandardError => e
-          Rapns::Daemon.logger.error(e)
+          Rapns.logger.error(e)
           reflect(:error, e)
         ensure
           queue.notification_processed

data/lib/rapns/daemon/feeder.rb

@@ -49,7 +49,7 @@ module Rapns
             end
           end
         rescue StandardError => e
-          Rapns::Daemon.logger.error(e)
+          Rapns.logger.error(e)
           reflect(:error, e)
         end
       end

data/lib/rapns/daemon/gcm/delivery.rb

@@ -47,7 +47,7 @@ module Rapns
 
           if body['failure'].to_i == 0
             mark_delivered
-            Rapns::Daemon.logger.info("[#{@app.name}] #{@notification.id} sent to #{@notification.registration_ids.join(', ')}")
+            Rapns.logger.info("[#{@app.name}] #{@notification.id} sent to #{@notification.registration_ids.join(', ')}")
           else
             handle_errors(response, body)
           end
@@ -79,17 +79,17 @@ module Rapns
 
         def internal_server_error(response)
           retry_delivery(@notification, response)
-          Rapns::Daemon.logger.warn("GCM responded with an Internal Error. " + retry_message)
+          Rapns.logger.warn("GCM responded with an Internal Error. " + retry_message)
         end
 
         def service_unavailable(response)
           retry_delivery(@notification, response)
-          Rapns::Daemon.logger.warn("GCM responded with an Service Unavailable Error. " + retry_message)
+          Rapns.logger.warn("GCM responded with an Service Unavailable Error. " + retry_message)
         end
 
         def all_devices_unavailable(response)
           retry_delivery(@notification, response)
-          Rapns::Daemon.logger.warn("All recipients unavailable. " + retry_message)
+          Rapns.logger.warn("All recipients unavailable. " + retry_message)
         end
 
         def some_devices_unavailable(response, errors)

data/lib/rapns/daemon/interruptible_sleep.rb

@@ -3,7 +3,7 @@ module Rapns
     module InterruptibleSleep
       def interruptible_sleep(seconds)
         @_sleep_check, @_sleep_interrupt = IO.pipe
-        IO.select([@_sleep_check], nil, nil, seconds)
+        IO.select([@_sleep_check], nil, nil, seconds) rescue Errno::EINVAL
         @_sleep_check.close rescue IOError
         @_sleep_interrupt.close rescue IOError
       end
@@ -15,4 +15,4 @@ module Rapns
       end
     end
   end
-end
+end

data/lib/rapns/daemon/reflectable.rb

@@ -5,7 +5,7 @@ module Rapns
         begin
           Rapns.reflections.__dispatch(name, *args)
         rescue StandardError => e
-          Rapns::Daemon.logger.error(e)
+          Rapns.logger.error(e)
         end
       end
     end

data/lib/rapns/daemon.rb

@@ -12,7 +12,6 @@ require 'rapns/daemon/database_reconnectable'
 require 'rapns/daemon/delivery'
 require 'rapns/daemon/delivery_queue'
 require 'rapns/daemon/feeder'
-require 'rapns/daemon/logger'
 require 'rapns/daemon/app_runner'
 require 'rapns/daemon/delivery_handler'
 
@@ -31,14 +30,7 @@ module Rapns
   module Daemon
     extend DatabaseReconnectable
 
-    class << self
-      attr_accessor :logger
-    end
-
     def self.start
-      self.logger = Logger.new(:foreground => Rapns.config.foreground,
-                               :airbrake_notify => Rapns.config.airbrake_notify)
-
       setup_signal_traps if trap_signals?
 
       if daemonize?
@@ -47,7 +39,7 @@ module Rapns
       end
 
       write_pid_file
-      ensure_upgraded
+      Upgraded.check(:exit => true)
       AppRunner.sync
       Feeder.start
     end
@@ -62,39 +54,11 @@ module Rapns
     protected
 
     def self.daemonize?
-      !(Rapns.config.foreground || Rapns.config.embedded || Rapns.config.push || defined?(JRUBY_VERSION))
-    end
-
-    def self.ensure_upgraded
-      count = 0
-
-      begin
-        count = Rapns::App.count
-      rescue ActiveRecord::StatementInvalid
-        puts "!!!! RAPNS NOT STARTED !!!!"
-        puts
-        puts "As of version v2.0.0 apps are configured in the database instead of rapns.yml."
-        puts "Please run 'rails g rapns' to generate the new migrations and create your app."
-        puts "See https://github.com/ileitch/rapns for further instructions."
-        puts
-        exit 1 unless Rapns.config.embedded || Rapns.config.push
-      end
-
-      if count == 0
-        logger.warn("You have not created an app yet. See https://github.com/ileitch/rapns for instructions.")
-      end
-
-      if File.exists?(File.join(Rails.root, 'config', 'rapns', 'rapns.yml'))
-        logger.warn(<<-EOS)
-Since 2.0.0 rapns uses command-line options and a Ruby based configuration file.
-Please run 'rails g rapns' to generate a new configuration file into config/initializers.
-Remove config/rapns/rapns.yml to avoid this warning.
-        EOS
-      end
+      !(Rapns.config.foreground || Rapns.config.embedded || defined?(JRUBY_VERSION))
     end
 
     def self.trap_signals?
-      !(Rapns.config.embedded || Rapns.config.push)
+      !Rapns.config.embedded
     end
 
     def self.setup_signal_traps
@@ -119,7 +83,7 @@ Remove config/rapns/rapns.yml to avoid this warning.
         begin
           File.open(Rapns.config.pid_file, 'w') { |f| f.puts Process.pid }
         rescue SystemCallError => e
-          logger.error("Failed to write PID to '#{Rapns.config.pid_file}': #{e.inspect}")
+          Rapns.logger.error("Failed to write PID to '#{Rapns.config.pid_file}': #{e.inspect}")
         end
       end
     end