rpush 1.0.0 → 2.0.0.beta1

data/lib/rpush/daemon/interruptible_sleep.rb

@@ -1,60 +1,41 @@
+require 'monitor'
+
 module Rpush
   module Daemon
     class InterruptibleSleep
-
-      def initialize
-        @sleep_reader, @wake_writer = IO.pipe
-        @udp_wakeup = nil
+      def initialize(duration)
+        @duration = duration
+        @obj = Object.new
+        @obj.extend(MonitorMixin)
+        @condition = @obj.new_cond
+        @stop = false
       end
 
-      # enable wake on receiving udp packets at the given address and port
-      # this returns the host,port used by bind in case an ephemeral port
-      # was indicated by specifying 0 as the port number.
-      # @return [String,Integer] host,port of bound UDP socket.
-      def enable_wake_on_udp(host, port)
-        @udp_wakeup = UDPSocket.new
-        @udp_wakeup.bind(host, port)
-        @udp_wakeup.addr.values_at(3,1)
+      def sleep
+        return if @stop
+        @obj.synchronize { @condition.wait(100_000) }
       end
 
-      # wait for the given timeout in seconds, or data was written to the pipe
-      # or the udp wakeup port if enabled.
-      # @return [boolean] true if the sleep was interrupted, or false
-      def sleep(timeout)
-        read_ports = [@sleep_reader]
-        read_ports << @udp_wakeup if @udp_wakeup
-        rs, = IO.select(read_ports, nil, nil, timeout) rescue nil
-
-        # consume all data on the readable io's so that our next call will wait for more data
-        perform_io(rs, @sleep_reader, :read_nonblock)
-        perform_io(rs, @udp_wakeup, :recv_nonblock)
-
-        !rs.nil? && rs.any?
-      end
+      def start
+        @stop = false
 
-      # writing to the pipe will wake the sleeping thread
-      def interrupt_sleep
-        @wake_writer.write('.')
+        @thread = Thread.new do
+          loop do
+            break if @stop
+            Kernel.sleep(@duration)
+            wakeup
+          end
+        end
       end
 
-      def close
-        @sleep_reader.close rescue nil
-        @wake_writer.close rescue nil
-        @udp_wakeup.close if @udp_wakeup rescue nil
+      def stop
+        @stop = true
+        wakeup
+        @thread.kill if @thread
       end
 
-      private
-
-      def perform_io(selected, io, meth)
-        if selected && selected.include?(io)
-          while true
-            begin
-              io.__send__(meth, 1)
-            rescue Errno::EAGAIN, IO::WaitReadable
-              break
-            end
-          end
-        end
+      def wakeup
+        @obj.synchronize { @condition.signal }
       end
     end
   end

data/lib/rpush/daemon/loggable.rb

@@ -20,10 +20,8 @@ module Rpush
       private
 
       def app_prefix(msg)
-        if app = instance_variable_get('@app')
-          msg = "[#{app.name}] #{msg}"
-        end
-
+        app = instance_variable_get('@app')
+        msg = "[#{app.name}] #{msg}" if app
         msg
       end
     end

data/lib/rpush/daemon/proc_title.rb

@@ -0,0 +1,16 @@
+module Rpush
+  module Daemon
+    class ProcTitle
+      def self.update
+        $0 = proc_title
+      end
+
+      def self.proc_title
+        total_dispatchers = AppRunner.num_dispatchers
+        dispatchers_str = total_dispatchers == 1 ? 'dispatcher' : 'dispatchers'
+        total_queued = AppRunner.num_queued
+        format("rpush | %s | %d queued | %d %s", Rpush.config.environment, total_queued, total_dispatchers, dispatchers_str)
+      end
+    end
+  end
+end

data/lib/rpush/daemon/queue_payload.rb

@@ -0,0 +1,12 @@
+module Rpush
+  module Daemon
+    class QueuePayload
+      attr_reader :batch, :notification
+
+      def initialize(batch, notification = nil)
+        @batch = batch
+        @notification = notification
+      end
+    end
+  end
+end

data/lib/rpush/daemon/reflectable.rb

@@ -2,11 +2,9 @@ module Rpush
   module Daemon
     module Reflectable
       def reflect(name, *args)
-        begin
-          Rpush.reflections.__dispatch(name, *args)
-        rescue StandardError => e
-          Rpush.logger.error(e)
-        end
+        Rpush.reflections.__dispatch(name, *args)
+      rescue StandardError => e
+        Rpush.logger.error(e)
       end
     end
   end

data/lib/rpush/daemon/retry_header_parser.rb

@@ -10,12 +10,12 @@ module Rpush
       end
 
       def parse
-        if @header
-          if @header.to_s =~ /^[0-9]+$/
-            Time.now + @header.to_i
-          else
-            Time.httpdate(@header)
-          end
+        return unless @header
+
+        if @header.to_s =~ /^[0-9]+$/
+          Time.now + @header.to_i
+        else
+          Time.httpdate(@header)
         end
       end
     end

data/lib/rpush/daemon/ring_buffer.rb

@@ -0,0 +1,16 @@
+module Rpush
+  module Daemon
+    class RingBuffer < Array
+      def initialize(max_size)
+        @max_size = max_size
+      end
+
+      def <<(obj)
+        shift if size >= @max_size
+        super
+      end
+
+      alias_method :push, :<<
+    end
+  end
+end

data/lib/rpush/daemon/service_config_methods.rb

@@ -2,17 +2,27 @@ module Rpush
   module Daemon
     module ServiceConfigMethods
       DISPATCHERS = {
-        :http => Rpush::Daemon::Dispatcher::Http,
-        :tcp => Rpush::Daemon::Dispatcher::Tcp
+        http: Rpush::Daemon::Dispatcher::Http,
+        tcp: Rpush::Daemon::Dispatcher::Tcp,
+        apns_tcp: Rpush::Daemon::Dispatcher::ApnsTcp
       }
 
+      def batch_deliveries(value = nil)
+        return batch_deliveries? if value.nil?
+        @batch_deliveries = value
+      end
+
+      def batch_deliveries?
+        @batch_deliveries == true
+      end
+
       def dispatcher(name = nil, options = {})
         @dispatcher_name = name
         @dispatcher_options = options
       end
 
       def dispatcher_class
-        DISPATCHERS[@dispatcher_name] || (raise NotImplementedError)
+        DISPATCHERS[@dispatcher_name] || (fail NotImplementedError)
       end
 
       def delivery_class
@@ -23,10 +33,16 @@ module Rpush
         dispatcher_class.new(app, delivery_class, @dispatcher_options)
       end
 
-      def loops(*loops)
-        @loops ||= []
-        @loops = loops if loops.any?
-        @loops
+      def loops(classes, options = {})
+        classes = Array[*classes]
+        @loops = classes.map { |cls| [cls, options] }
+      end
+
+      def loop_instances(app)
+        (@loops || []).map do |cls, options|
+          next unless options.key?(:if) ? options[:if].call : true
+          cls.new(app)
+        end.compact
       end
     end
   end

data/lib/rpush/daemon/signal_handler.rb

@@ -0,0 +1,51 @@
+module Rpush
+  module Daemon
+    class SignalHandler
+      class << self
+        attr_reader :thread
+      end
+
+      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") }
+        end
+      end
+
+      def self.stop
+        @write_io.write("shutdown\n") 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']
+              AppRunner.sync
+              Feeder.wakeup
+            when Signal.list['USR2']
+              AppRunner.debug
+            when Signal.list['INT'], Signal.list['TERM']
+              Thread.new { handle_shutdown_signal }
+            else
+              break
+            end
+          end
+        end
+      end
+
+      def self.handle_shutdown_signal
+        @shutting_down = true
+        Rpush::Daemon.shutdown
+      end
+
+      def self.trap_signals?
+        !Rpush.config.embedded
+      end
+    end
+  end
+end

data/lib/rpush/daemon/store/active_record.rb

@@ -8,49 +8,66 @@ module Rpush
       class ActiveRecord
         include Reconnectable
 
-        DEFAULT_MARK_OPTIONS = {:persist => true}
+        DEFAULT_MARK_OPTIONS = { persist: true }
 
-        def deliverable_notifications(apps)
+        def app(id)
+          Rpush::Client::ActiveRecord::App.find(id)
+        end
+
+        def all_apps
+          Rpush::Client::ActiveRecord::App.all
+        end
+
+        def deliverable_notifications(limit)
           with_database_reconnect_and_retry do
-            batch_size = Rpush.config.batch_size
-            relation = Rpush::Notification.ready_for_delivery.for_apps(apps)
-            relation = relation.limit(batch_size) unless Rpush.config.push
-            relation.to_a
+            Rpush::Client::ActiveRecord::Notification.transaction do
+              relation = ready_for_delivery
+              relation = relation.limit(limit)
+              notifications = relation.lock(true).to_a
+              mark_processing(notifications)
+              notifications
+            end
           end
         end
 
         def mark_retryable(notification, deliver_after, opts = {})
           opts = DEFAULT_MARK_OPTIONS.dup.merge(opts)
+          notification.processing = false
           notification.retries += 1
           notification.deliver_after = deliver_after
 
-          if opts[:persist]
-            with_database_reconnect_and_retry do
-              notification.save!(:validate => false)
-            end
+          return unless opts[:persist]
+
+          with_database_reconnect_and_retry do
+            notification.save!(validate: false)
           end
         end
 
         def mark_batch_retryable(notifications, deliver_after)
           ids = []
           notifications.each do |n|
-            mark_retryable(n, deliver_after, :persist => false)
+            mark_retryable(n, deliver_after, persist: false)
             ids << n.id
           end
+          mark_ids_retryable(ids, deliver_after)
+        end
+
+        def mark_ids_retryable(ids, deliver_after)
           with_database_reconnect_and_retry do
-            Rpush::Notification.where(:id => ids).update_all(['retries = retries + 1, deliver_after = ?', deliver_after])
+            Rpush::Client::ActiveRecord::Notification.where(id: ids).update_all(['processing = ?, delivered = ?, delivered_at = ?, failed = ?, failed_at = ?, retries = retries + 1, deliver_after = ?', false, false, nil, false, nil, deliver_after])
           end
         end
 
         def mark_delivered(notification, time, opts = {})
           opts = DEFAULT_MARK_OPTIONS.dup.merge(opts)
+          notification.processing = false
           notification.delivered = true
           notification.delivered_at = time
 
-          if opts[:persist]
-            with_database_reconnect_and_retry do
-              notification.save!(:validate => false)
-            end
+          return unless opts[:persist]
+
+          with_database_reconnect_and_retry do
+            notification.save!(validate: false)
           end
         end
 
@@ -58,16 +75,17 @@ module Rpush
           now = Time.now
           ids = []
           notifications.each do |n|
-            mark_delivered(n, now, :persist => false)
+            mark_delivered(n, now, persist: false)
             ids << n.id
           end
           with_database_reconnect_and_retry do
-            Rpush::Notification.where(:id => ids).update_all(['delivered = ?, delivered_at = ?', true, now])
+            Rpush::Client::ActiveRecord::Notification.where(id: ids).update_all(['processing = ?, delivered = ?, delivered_at = ?', false, true, now])
           end
         end
 
         def mark_failed(notification, code, description, time, opts = {})
           opts = DEFAULT_MARK_OPTIONS.dup.merge(opts)
+          notification.processing = false
           notification.delivered = false
           notification.delivered_at = nil
           notification.failed = true
@@ -75,10 +93,10 @@ module Rpush
           notification.error_code = code
           notification.error_description = description
 
-          if opts[:persist]
-            with_database_reconnect_and_retry do
-              notification.save!(:validate => false)
-            end
+          return unless opts[:persist]
+
+          with_database_reconnect_and_retry do
+            notification.save!(validate: false)
           end
         end
 
@@ -86,28 +104,32 @@ module Rpush
           now = Time.now
           ids = []
           notifications.each do |n|
-            mark_failed(n, code, description, now, :persist => false)
+            mark_failed(n, code, description, now, persist: false)
             ids << n.id
           end
+          mark_ids_failed(ids, code, description, now)
+        end
+
+        def mark_ids_failed(ids, code, description, time)
           with_database_reconnect_and_retry do
-            Rpush::Notification.where(:id => ids).update_all(['delivered = ?, delivered_at = NULL, failed = ?, failed_at = ?, error_code = ?, error_description = ?', false, true, now, code, description])
+            Rpush::Client::ActiveRecord::Notification.where(id: ids).update_all(['processing = ?, delivered = ?, delivered_at = NULL, failed = ?, failed_at = ?, error_code = ?, error_description = ?', false, false, true, time, code, description])
           end
         end
 
         def create_apns_feedback(failed_at, device_token, app)
           with_database_reconnect_and_retry do
-            Rpush::Apns::Feedback.create!(:failed_at => failed_at,
-              :device_token => device_token, :app => app)
+            Rpush::Client::ActiveRecord::Apns::Feedback.create!(failed_at: failed_at,
+                                                                device_token: device_token, app: app)
           end
         end
 
         def create_gcm_notification(attrs, data, registration_ids, deliver_after, app)
-          notification = Rpush::Gcm::Notification.new
+          notification = Rpush::Client::ActiveRecord::Gcm::Notification.new
           create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
         end
 
         def create_adm_notification(attrs, data, registration_ids, deliver_after, app)
-          notification = Rpush::Adm::Notification.new
+          notification = Rpush::Client::ActiveRecord::Adm::Notification.new
           create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
         end
 
@@ -123,21 +145,15 @@ module Rpush
           end
         end
 
-        def after_daemonize
-          reconnect_database
-        end
-
         def release_connection
-          begin
-            ::ActiveRecord::Base.connection_pool.release_connection
-          rescue StandardError => e
-            Rpush.logger.error(e)
-          end
+          ::ActiveRecord::Base.connection.close
+        rescue StandardError => e
+          Rpush.logger.error(e)
         end
 
         private
 
-        def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app)
+        def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists
           with_database_reconnect_and_retry do
             notification.assign_attributes(attrs)
             notification.data = data
@@ -148,7 +164,24 @@ module Rpush
             notification
           end
         end
+
+        def ready_for_delivery
+          Rpush::Client::ActiveRecord::Notification.where('processing = ? AND delivered = ? AND failed = ? AND (deliver_after IS NULL OR deliver_after < ?)', false, false, false, Time.now)
+        end
+
+        def mark_processing(notifications)
+          return if notifications.empty?
+
+          ids = []
+          notifications.each do |n|
+            n.processing = true
+            ids << n.id
+          end
+          Rpush::Client::ActiveRecord::Notification.where(id: ids).update_all(['processing = ?', true])
+        end
       end
     end
   end
 end
+
+Rpush::Daemon::Store::Interface.check(Rpush::Daemon::Store::ActiveRecord)