rpush 2.0.0.rc1-java → 2.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc01aeffab54e2ec19bc908f3b38640cdd31b6c8
-  data.tar.gz: 729ab2e1a5132e130535dabbfe2403457818899d
+  metadata.gz: 13082e421fbc9ede84fe1dea84373de5ccab8bd5
+  data.tar.gz: c1b695784b56de4a796e75402c808d015f7d9c8f
 SHA512:
-  metadata.gz: 0dbcca1188ed3eb635b8f15eb4de10a376c66954bb3d0b7cc91f487d1da086b4dd13d596650c775133ae169eb0df39a0748d911dd82be76a7376a0599ba97e16
-  data.tar.gz: 0470666c1fa13dbd45fe29cf83449e9b921e4842d2c2c7c668f8078d1f5fb7e6b518f5d6ac37d0b0c54fcf58f0c0b57f3297a00799c1ea58ca65d3de95c48b62
+  metadata.gz: bc6c33f58cb98c3f5a0958fc8a11b554b375aae30e3ad0f44d61a5ddb91da5ae970e0fd4c7b8fe35d773771dedd37b011a4527030df023e7587fa2b5eb49f04c
+  data.tar.gz: 44ebe64b26b051db0e0ae5acb1bfb91cd1ec0efc6a2658138f2a1c493be013f8785683e46ba9a39d2c4c93f7f4bbef101c2a4a7dddca70278fa43544a3861c93

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 2.0.0 (unreleased)
+## 2.0.1 (Sept 13, 2014)
+  * Add ssl_certificate_revoked reflection (#68).
+  * Fix for Postgis support in 2.0.0 migration (#70).
+
+## 2.0.0 (Sept 6, 2014)
   * Use APNs enhanced binary format version 2.
   * Support running multiple Rpush processes when using ActiveRecord and Redis.
   * APNs error detection is now performed asynchronously, 'check_for_errors' is therefore deprecated.
@@ -11,6 +15,7 @@
   * The 'batch_storage_updates' config option has been deprecated, storage backends will now always batch updates where appropriate.
   * The rpush process title updates with number of queued notifications and number of dispatchers.
   * Rpush::Apns::Feedback#app has been renamed to app_id and is now an Integer.
+  * An app is restarted when the HUP signal is received if its certificate or environment attribute changed.
 
 ## 1.0.0 (Feb 9, 2014)
   * Renamed to Rpush (from Rapns). Version number reset to 1.0.0.

data/README.md

@@ -7,15 +7,21 @@
 
 ### Rpush. The push notification service for Ruby.
 
-* Supports:
-  * **Apple Push Notification Service**
-  * **Google Cloud Messaging**
-  * **Amazon Device Messaging**
-  * **Windows Phone Push Notification Service**.
-* Seamless Rails (3, 4) integration.
-* Scalable - choose the number of persistent connections for each app.
-* Designed for uptime - signal -HUP to add, update apps.
-* Run as a daemon or inside an [existing processs](https://github.com/rpush/rpush/wiki/Embedding-API).
+* Supported services:
+  * [**Apple Push Notification Service**](#apple-push-notification-service)
+  * [**Google Cloud Messaging**](#google-cloud-messaging)
+  * [**Amazon Device Messaging**](#amazon-device-messaging)
+  * [**Windows Phone Push Notification Service**](#windows-phone-notification-service)
+
+* Supported storage backends:
+  * **ActiveRecord**
+  * **Redis**
+  * More coming!
+
+* Seamless Rails integration (3 & 4) .
+* Scales vertically (threading) and horizontally (multiple processes).
+* Designed for uptime - new apps are loaded automatically, signal `HUP` to update running apps.
+* Run as a daemon or inside an [existing process](https://github.com/rpush/rpush/wiki/Embedding-API).
 * Use in a scheduler for low-workload deployments ([Push API](https://github.com/rpush/rpush/wiki/Push-API)).
 * Hooks for fine-grained instrumentation and error handling ([Reflection API](https://github.com/rpush/rpush/wiki/Reflection-API)).
 * Works with MRI, JRuby and Rubinius.
@@ -122,31 +128,40 @@ n.alert = "..."
 n.save!
 ```
 
-### Starting Rpush
+### Running Rpush
 
-As a daemon (recommended):
+It is recommended to run Rpush as a separate process in most cases, though embedding and manual modes are provided for low-workload environments.
+
+#### As a daemon (recommended):
 
     cd /path/to/rails/app
     rpush <Rails environment> [options]
 
-Inside an existing process (see [Embedding API](https://github.com/rpush/rpush/wiki/Embedding-API)):
+#### Embedded inside an existing process
 
 ```ruby
+# Call this during startup of your application, for example, by adding it to the end of config/initializers/rpush.rb
 Rpush.embed
 ```
 
-In a scheduler (see [Push API](https://github.com/rpush/rpush/wiki/Push-API)):
+See [Embedding API](https://github.com/rpush/rpush/wiki/Embedding-API) for more details.
+
+#### Manually (in a scheduler)
 
 ```ruby
 Rpush.push
 Rpush.apns_feedback
 ```
 
+See [Push API](https://github.com/rpush/rpush/wiki/Push-API) for more details.
+
+### Configuration
+
 See [Configuration](https://github.com/rpush/rpush/wiki/Configuration) for a list of options, or run `rpush --help`.
 
 ### Updating Rpush
 
-After updating you should run `rails g rpush` to check for any new migrations.
+If you're using ActiveRecord, you should run `rails g rpush` after upgrading Rpush to check for any new migrations.
 
 ### Wiki
 

data/bin/rpush

@@ -12,10 +12,10 @@ options = ARGV.options do |opts|
   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.") { |n| config.push_poll = n }
   opts.on('-F N', '--feedback-poll N', Integer, "Frequency in seconds to check for feedback.") { |n| config.feedback_poll = n }
-  opts.on('-e', '--no-error-checks', 'Disable APNs error checking after notification delivery.') { config.check_for_errors = false }
+  opts.on('-e', '--no-error-checks', 'Disable APNs error checking after notification delivery.') { config.check_for_errors = false } # deprecated
   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, 'Storage backend notification batch size.') { |n| config.batch_size = n }
-  opts.on('-B', '--[no-]batch-storage-updates', 'Perform storage updates in batches.') { |v| config.batch_storage_updates = v }
+  opts.on('-B', '--[no-]batch-storage-updates', 'Perform storage updates in batches.') { |v| config.batch_storage_updates = v } # deprecated
   opts.on('-v', '--version', 'Print the version.') do
     puts "rpush #{Rpush::VERSION}"
     exit

data/lib/generators/templates/rpush.rb

@@ -106,6 +106,10 @@ Rpush.reflect do |on|
   # on.ssl_certificate_will_expire do |app, expiration_time|
   # end
 
+  # Called when an SSL certificate has been revoked.
+  # on.ssl_certificate_revoked do |app, error|
+  # end
+
   # Called when the ADM returns a canonical registration ID.
   # You will need to replace old_id with canonical_id in your records.
   # on.adm_canonical_id do |old_id, canonical_id|
@@ -119,7 +123,6 @@ Rpush.reflect do |on|
   # on.adm_failed_to_recipient do |notification, registration_id, reason|
   # end
 
-
   # Called when an exception is raised.
   # on.error do |error|
   # end

data/lib/generators/templates/rpush_2_0_0_updates.rb

@@ -7,7 +7,7 @@ class Rpush200Updates < ActiveRecord::Migration
       remove_index :rpush_notifications, name: :index_rpush_notifications_multi
     end
 
-    add_index :rpush_notifications, [:processing, :delivered, :failed, :deliver_after], name: 'index_rpush_notifications_multi'
+    add_index :rpush_notifications, [:delivered, :failed], name: 'index_rpush_notifications_multi', where: 'NOT delivered AND NOT failed'
 
     rename_column :rpush_feedback, :app, :app_id
 
@@ -37,6 +37,6 @@ class Rpush200Updates < ActiveRecord::Migration
   end
 
   def self.postgresql?
-    adapter_name =~ /postgresql/
+    adapter_name =~ /postgresql|postgis/
   end
 end

data/lib/rpush/client/redis/app.rb

@@ -14,6 +14,8 @@ module Rpush
         attribute :client_id, :string
         attribute :client_secret, :string
 
+        index :name
+
         validates :name, presence: true
         validates_numericality_of :connections, greater_than: 0, only_integer: true
       end

data/lib/rpush/daemon.rb

@@ -51,8 +51,8 @@ module Rpush
     end
 
     def self.start
-      SignalHandler.start
       Process.daemon if daemonize?
+      SignalHandler.start
       initialize_store
       write_pid_file
       Synchronizer.sync

data/lib/rpush/daemon/app_runner.rb

@@ -4,7 +4,9 @@ module Rpush
       extend Reflectable
       include Reflectable
       include Loggable
+      extend Loggable
       include StringHelpers
+      extend StringHelpers
 
       @runners = {}
 
@@ -24,6 +26,7 @@ module Rpush
       def self.start_app(app)
         @runners[app.id] = new(app)
         @runners[app.id].start
+        log_info("[#{app.name}] Started, #{pluralize(app.connections, 'dispatcher')}.")
       rescue StandardError => e
         @runners.delete(app.id)
         Rpush.logger.error("[#{app.name}] Exception raised during startup. Notifications will not be delivered for this app.")
@@ -32,7 +35,15 @@ module Rpush
       end
 
       def self.stop_app(app_id)
-        @runners.delete(app_id).stop
+        runner = @runners.delete(app_id)
+        if runner
+          runner.stop
+          log_info("[#{runner.app.name}] Stopped.")
+        end
+      end
+
+      def self.app_with_id(app_id)
+        @runners[app_id].app
       end
 
       def self.app_running?(app)

data/lib/rpush/daemon/signal_handler.rb

@@ -7,42 +7,47 @@ module Rpush
 
       def self.start
         return unless trap_signals?
-        @shutting_down = false
+
         read_io, @write_io = IO.pipe
         start_handler(read_io)
         %w(INT TERM HUP USR2).each do |signal|
-          Signal.trap(signal) { @write_io.write("#{Signal.list[signal]}\n") }
+          Signal.trap(signal) { @write_io.puts(signal) }
         end
       end
 
       def self.stop
-        @write_io.write("shutdown\n") if @write_io
+        @write_io.puts('break') if @write_io
         @thread.join if @thread
       end
 
       def self.start_handler(read_io)
         @thread = Thread.new do
-          loop do
-            case read_io.readline.strip.to_i
-            when Signal.list['HUP']
-              Synchronizer.sync
-              Feeder.wakeup
-            when Signal.list['USR2']
-              AppRunner.debug
-            when Signal.list['INT'], Signal.list['TERM']
-              Thread.new { handle_shutdown_signal }
-            else
-              break
+          while readable_io = IO.select([read_io]) # rubocop:disable AssignmentInCondition
+            signal = readable_io.first[0].gets.strip
+
+            begin
+              case signal
+              when 'HUP'
+                Synchronizer.sync
+                Feeder.wakeup
+              when 'USR2'
+                AppRunner.debug
+              when 'INT', 'TERM'
+                Thread.new { Rpush::Daemon.shutdown }
+                break
+              when 'break'
+                break
+              else
+                Rpush.logger.error("Unhandled signal: #{signal}")
+              end
+            rescue StandardError => e
+              Rpush.logger.error("Error raised when hndling signal '#{signal}'")
+              Rpush.logger.error(e)
             end
           end
         end
       end
 
-      def self.handle_shutdown_signal
-        @shutting_down = true
-        Rpush::Daemon.shutdown
-      end
-
       def self.trap_signals?
         !Rpush.config.embedded
       end

data/lib/rpush/daemon/synchronizer.rb

@@ -14,13 +14,19 @@ module Rpush
       end
 
       def self.sync_app(app)
-        unless AppRunner.app_running?(app)
+        if !AppRunner.app_running?(app)
           AppRunner.start_app(app)
-          log_info("[#{app.name}] Started, #{pluralize(app.connections, 'dispatcher')}.")
-          return
+        elsif certificate_changed?(app)
+          log_info("[#{app.name}] Certificate changed, restarting...")
+          AppRunner.stop_app(app.id)
+          AppRunner.start_app(app)
+        elsif environment_changed?(app)
+          log_info("[#{app.name}] Environment changed, restarting...")
+          AppRunner.stop_app(app.id)
+          AppRunner.start_app(app)
+        else
+          sync_dispatcher_count(app)
         end
-
-        sync_dispatcher_count(app)
       end
 
       def self.sync_dispatcher_count(app)
@@ -39,6 +45,16 @@ module Rpush
         num_dispatchers = AppRunner.num_dispatchers_for_app(app)
         log_info("[#{app.name}] #{start_stop_str} #{pluralize(diff.abs, 'dispatcher')}. #{num_dispatchers} running.")
       end
+
+      def self.certificate_changed?(app)
+        old_app = AppRunner.app_with_id(app.id)
+        app.certificate != old_app.certificate
+      end
+
+      def self.environment_changed?(app)
+        old_app = AppRunner.app_with_id(app.id)
+        app.environment != old_app.environment
+      end
     end
   end
 end

data/lib/rpush/daemon/tcp_connection.rb

@@ -108,6 +108,12 @@ module Rpush
         ssl_socket.sync = true
         ssl_socket.connect
         [tcp_socket, ssl_socket]
+      rescue StandardError => error
+        if error.message =~ /certificate revoked/i
+          log_warn('Certificate has been revoked.')
+          reflect(:ssl_certificate_revoked, @app, error)
+        end
+        raise
       end
 
       def check_certificate_expiration

data/lib/rpush/reflection.rb

@@ -15,7 +15,7 @@ module Rpush
       :notification_failed, :notification_will_retry, :gcm_delivered_to_recipient,
       :gcm_failed_to_recipient, :gcm_canonical_id, :gcm_invalid_registration_id,
       :error, :adm_canonical_id, :adm_failed_to_recipient,
-      :tcp_connection_lost, :ssl_certificate_will_expire,
+      :tcp_connection_lost, :ssl_certificate_will_expire, :ssl_certificate_revoked,
       :notification_id_will_retry, :notification_id_failed
     ]
 

data/lib/rpush/version.rb

@@ -1,3 +1,3 @@
 module Rpush
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.1'
 end

data/spec/functional/apns_spec.rb

@@ -127,17 +127,16 @@ describe 'APNs' do
         notification1.delivered.should be_true
       end
 
-      it 'marks notifications following the failed one as retryable' # do
-      #   # Such hacks. Set the poll frequency high enough that we'll only ever feed once.
-      #   Rpush.config.push_poll = 1_000_000
-      #
-      #   notifications.each { |n| wait_for_notification_to_deliver(n) }
-      #   fail_notification(notification2)
-      #
-      #   [notification3, notification4].each do |n|
-      #     wait_for_notification_to_retry(n)
-      #   end
-      # end
+      it 'marks notifications following the failed one as retryable' do
+        Rpush.config.push_poll = 1_000_000
+
+        notifications.each { |n| wait_for_notification_to_deliver(n) }
+        fail_notification(notification2)
+
+        [notification3, notification4].each do |n|
+          wait_for_notification_to_retry(n)
+        end
+      end
 
       describe 'without an error response' do
         it 'marks all notifications as failed' do

data/spec/functional/synchronization_spec.rb

@@ -16,6 +16,9 @@ describe 'Synchronization' do
     app.name = 'test'
     app.auth_key = 'abc123'
     app.connections = 2
+    app.certificate = TEST_CERT_WITH_PASSWORD
+    app.password = 'fubar'
+    app.environment = 'sandbox'
     app.save!
 
     Rpush.embed
@@ -43,4 +46,23 @@ describe 'Synchronization' do
     Rpush.sync
     Rpush::Daemon::AppRunner.app_running?(app).should be_false
   end
+
+  it 'restarts an app when the certificate is changed' do
+    app.certificate = TEST_CERT
+    app.password = nil
+    app.save!
+    Rpush.sync
+
+    running_app = Rpush::Daemon::AppRunner.app_with_id(app.id)
+    expect(running_app.certificate).to eql(TEST_CERT)
+  end
+
+  it 'restarts an app when the environment is changed' do
+    app.environment = 'production'
+    app.save!
+    Rpush.sync
+
+    running_app = Rpush::Daemon::AppRunner.app_with_id(app.id)
+    expect(running_app.environment).to eql('production')
+  end
 end

data/spec/unit/daemon/app_runner_spec.rb

@@ -32,7 +32,7 @@ module Rpush
 end
 
 describe Rpush::Daemon::AppRunner, 'enqueue' do
-  let(:app) { double(id: 1) }
+  let(:app) { double(id: 1, name: 'Test', connections: 1) }
   let(:notification) { double(app_id: 1) }
   let(:runner) { double(Rpush::Daemon::AppRunner, enqueue: nil, start: nil, stop: nil) }
   let(:logger) { double(Rpush::Logger, error: nil, info: nil) }
@@ -53,7 +53,7 @@ describe Rpush::Daemon::AppRunner, 'enqueue' do
 
   it 'starts the app if a runner does not exist' do
     notification = double(app_id: 3)
-    new_app = double(Rpush::App, id: 3)
+    new_app = double(Rpush::App, id: 3, name: 'NewApp', connections: 1)
     Rpush::Daemon.store = double(app: new_app)
     Rpush::Daemon::AppRunner.enqueue([notification])
     Rpush::Daemon::AppRunner.app_running?(new_app).should be_true

data/spec/unit/daemon/signal_handler_spec.rb

@@ -69,4 +69,27 @@ describe Rpush::Daemon::SignalHandler do
       end
     end
   end
+
+  describe 'error handing' do
+    let(:error) { StandardError.new('test') }
+
+    before { Rpush.stub(logger: double(error: nil)) }
+
+    it 'logs errors received when handling a signal' do
+      Rpush::Daemon::Synchronizer.stub(:sync).and_raise(error)
+      expect(Rpush.logger).to receive(:error).with(error)
+      with_handler_start_stop do
+        signal_handler('HUP')
+      end
+    end
+
+    it 'does not interrupt processing of further errors' do
+      Rpush::Daemon::Synchronizer.stub(:sync).and_raise(error)
+      expect(Rpush::Daemon::AppRunner).to receive(:debug)
+      with_handler_start_stop do
+        signal_handler('HUP')
+        signal_handler('USR2')
+      end
+    end
+  end
 end

data/spec/unit/daemon/tcp_connection_spec.rb

@@ -113,6 +113,23 @@ describe Rpush::Daemon::TcpConnection do
         end
       end
     end
+
+    describe 'certificate revocation' do
+      let(:cert_revoked_error) { OpenSSL::SSL::SSLError.new('certificate revoked') }
+      before do
+        ssl_socket.stub(:connect).and_raise(cert_revoked_error)
+      end
+
+      it 'reflects that the certificate has been revoked' do
+        connection.should_receive(:reflect).with(:ssl_certificate_revoked, app, cert_revoked_error)
+        expect { connection.connect }.to raise_error(cert_revoked_error)
+      end
+
+      it 'logs that the certificate has been revoked' do
+        logger.should_receive(:warn).with('[Connection 0] Certificate has been revoked.')
+        expect { connection.connect }.to raise_error(cert_revoked_error)
+      end
+    end
   end
 
   describe "when shuting down the connection" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.1
 platform: java
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -277,9 +277,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.1.9