push-core 1.0.3 → 1.0.4

data/README.md

@@ -142,6 +142,35 @@ Push runs on Heroku with the following line in the `Procfile`.
 
     push: bundle exec push $RACK_ENV -f
 
+## Capistrano
+
+Capistrano recipe using the pid file.
+```ruby
+after "deploy:stop",    "push:stop"
+after "deploy:start",   "push:start"
+before "deploy:restart", "push:restart"
+
+set(:pushd_pid_file) { "#{current_path}/tmp/pids/push_daemon.pid" }
+
+namespace :push do
+  desc 'Start the push daemon'
+  task :start, :roles => :worker do
+    run "cd #{current_path} ; nohup bundle exec push #{rails_env} -p #{pushd_pid_file} >> #{current_path}/log/push.log 2>&1 &", :pty => false
+  end
+
+  desc 'Stop the push daemon'
+  task :stop, :roles => :worker do
+    run "if [ -d #{current_path} ] && [ -f #{pushd_pid_file} ] && kill -0 `cat #{pushd_pid_file}`> /dev/null 2>&1; then kill -SIGINT `cat #{pushd_pid_file}` ; else echo 'push daemon is not running'; fi"
+  end
+
+  desc "Restart the push daemon"
+  task :restart, :roles => :worker do
+    stop
+    start
+  end
+end
+```
+
 ## Prerequisites
 
 * Rails 3.2.x

data/lib/push/configuration.rb

@@ -1,7 +1,7 @@
 module Push
   class Configuration < ActiveRecord::Base
     self.table_name = 'push_configurations'
-    scope :enabled, where(:enabled => true)
+    scope :enabled, -> { where(:enabled => true) }
     validates :app, :presence => true
     validates :connections, :presence => true
     validates :connections, :numericality => { :greater_than => 0, :only_integer => true }

data/lib/push/daemon/app.rb

@@ -1,6 +1,7 @@
 module Push
   module Daemon
     class App
+      extend DatabaseReconnectable
       class << self
         attr_reader :apps
       end
@@ -8,12 +9,14 @@ module Push
       @apps = {}
 
       def self.load
-        configurations = Push::Configuration.enabled
-        configurations.each do |config|
-          if @apps[config.app] == nil
-            @apps[config.app] = App.new(config.app)
+        with_database_reconnect_and_retry('App.load') do
+          configurations = Push::Configuration.enabled
+          configurations.each do |config|
+            if @apps[config.app] == nil
+              @apps[config.app] = App.new(config.app)
+            end
+            @apps[config.app].configs << config
           end
-          @apps[config.app].configs << config
         end
       end
 

data/lib/push/daemon/database_reconnectable.rb

@@ -3,8 +3,12 @@ module Push
     module DatabaseReconnectable
       def adaptor_errors
         errors = [ActiveRecord::StatementInvalid, ActiveRecord::ConnectionNotEstablished]
-        errors << PGError if defined?(PGError)
-        errors << Mysql2::Error if defined?(Mysql2)
+        if defined?(::PG::Error)
+          errors << ::PG::Error
+        elsif defined?(::PGError)
+          errors << ::PGError
+        end
+        errors << ::Mysql2::Error if defined?(::Mysql2)
         errors
       end
 
@@ -36,8 +40,13 @@ module Push
       end
 
       def reconnect_database
-        ActiveRecord::Base.clear_all_connections!
-        ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[ENV['RAILS_ENV']])
+        begin
+          ActiveRecord::Base.clear_all_connections!
+        rescue
+          Push::Daemon.logger.error("ActiveRecord::Base.clear_all_connections! failed")
+        ensure
+          ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[ENV['RAILS_ENV']])
+        end
       end
 
       def check_database_is_connected

data/lib/push/daemon/logger.rb

@@ -37,7 +37,7 @@ module Push
 
         if @options[:foreground]
           puts formatted_msg
-        else
+        elsif @logger
           @logger.send(where, formatted_msg)
         end
       end
@@ -45,8 +45,13 @@ module Push
       def open_log
         log_file = File.open(File.join(Rails.root, 'log', 'push.log'), 'a')
         log_file.sync = true
-        @logger = ActiveSupport::BufferedLogger.new(log_file, Rails.logger.level)
-        @logger.auto_flushing = Rails.logger.respond_to?(:auto_flushing) ? Rails.logger.auto_flushing : true
+
+        if defined?(ActiveSupport::BufferedLogger)
+          @logger = ActiveSupport::BufferedLogger.new(log_file, Rails.logger.level)
+          @logger.auto_flushing = Rails.logger.respond_to?(:auto_flushing) ? Rails.logger.auto_flushing : true
+        elsif defined?(ActiveSupport::Logger)
+          @logger = ActiveSupport::Logger.new(log_file, Rails.logger.level)
+        end
       end
 
       def error_notification(e, options)

data/lib/push/feedback.rb

@@ -3,7 +3,7 @@ module Push
     include Push::Daemon::DatabaseReconnectable
     self.table_name = 'push_feedback'
 
-    scope :ready_for_followup, where(:processed => false)
+    scope :ready_for_followup, -> { where(:processed => false) }
     validates :app, :presence => true
     validates :device, :presence => true
     validates :follow_up, :presence => true

data/lib/push/message.rb

@@ -9,7 +9,7 @@ module Push
     validates :app, :presence => true
     validates :device, :presence => true
 
-    scope :ready_for_delivery, lambda { where('delivered = ? AND failed = ? AND (deliver_after IS NULL OR deliver_after < ?)', false, false, Time.now) }
+    scope :ready_for_delivery, -> { where('delivered = ? AND failed = ? AND (deliver_after IS NULL OR deliver_after < ?)', false, false, Time.now) }
 
     def deliver(connection)
       begin

data/lib/push/version.rb

@@ -1,3 +1,3 @@
 module Push
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: push-core
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement