global_error_handler 1.1.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 316acd20a326cf7e663729b28bf45fb57e7798a6
-  data.tar.gz: 66ee6184856edc3c4d1d0ff26f9c029e057585f8
+  metadata.gz: 9754eb3b73eaff7706b3f65e5c5f4a45b454d874
+  data.tar.gz: c45f97699e47d4e6873b17ecd788c1376316d465
 SHA512:
-  metadata.gz: d7119d94b20bdf97529e0e1a821b6fb9ffb3a5c7206a565f7934bfc5df66bba2662dd877854fd4b81f8417715745a0c33e6b775b5f5f518b1ecbdd286ce932d2
-  data.tar.gz: f1e1f8fd2da47793a30ea992e36d09e4203a45f1fe4337c410e8a0617f638c47173c6ef01464c8cfc8bc6184202a9be2fc7b31d53cafff3b74fcc0d601a782f4
+  metadata.gz: 8975a6cc714719315e097adc6fcd78142b24529bb5cda52b2c2ac26dd1bc325a3132c8cbd68c855d0a39b489bc9e88d9e94782dd52dd1f7bec07a77ddf8984c8
+  data.tar.gz: 373dcdd22986e947b9a8ae6286e5aca4196b8f7afb6b911338e29705bf7073af1630ed0911019535589a425d406e80bfa0bccfa58ad42199f932ea3bca03f9d8

data/README.md

@@ -19,7 +19,7 @@ It adds Exceptions tab to Redis Web server in case to view, filter, delete or tr
 
 Add this line to your application's Gemfile:
 
-    gem 'global_error_handler'
+    gem 'global_error_handler', '~> 1.2.3'
 
 And then execute:
 

data/config/templates/geh_subscription_init.sh.erb

@@ -4,12 +4,48 @@
 # /etc/init.d/<%= application %>_geh_subscription
 
 start() {
-  su - <%= user %> -c "cd <%= current_path %>; PATH=$PATH:/home/<%= user %>/.rvm/bin; RAILS_ENV=<%= rails_env %> nohup rvm <%= rvm_ruby_string %> do rake global_error_handler:cleanup_database_dependencies >/dev/null 2>&1 & sleep 2"
-  su - <%= user %> -c "cd <%= current_path %>; PATH=$PATH:/home/<%= user %>/.rvm/bin; RAILS_ENV=<%= rails_env %> nohup rvm <%= rvm_ruby_string %> do rake global_error_handler:subscribe_to_expired >/dev/null 2>&1 & sleep 3"
+  pid_file=<%= shared_path %>/pids/global_error_handler_subscription.pid
+  if [ -e "$pid_file" ] && \
+    kill -0 `cat $pid_file` >/dev/null 2>&1; then
+    echo GEH Subscription is already running. Quiting...
+  else
+    rm -f $pid_file >/dev/null 2>&1
+    echo GEH Subscription is not running. Executing start command...
+    su - <%= user %> -c "cd <%= current_path %>; PATH=$PATH:/home/<%= user %>/.rvm/bin; \
+      RAILS_ENV=<%= rails_env %> nohup rvm <%= rvm_ruby_string %> do rake global_error_handler:cleanup_database_dependencies >/dev/null 2>&1 & sleep 2"
+    su - <%= user %> -c "cd <%= current_path %>; PATH=$PATH:/home/<%= user %>/.rvm/bin; \
+      RAILS_ENV=<%= rails_env %> nohup rvm <%= rvm_ruby_string %> do rake global_error_handler:subscribe_to_expired >/dev/null 2>&1 & sleep 3"
+    echo done
+  fi
 }
 
 stop() {
-  su - <%= user %> -c "cd <%= current_path %>; PATH=$PATH:<%= rvm_bin_path %>; RAILS_ENV=<%= rails_env %> rvm <%= rvm_ruby_string %> do rake global_error_handler:unsubscribe_from_expired"
+  pid_file=<%= shared_path %>/pids/global_error_handler_subscription.pid
+  if [ -e "$pid_file" ] && \
+    kill -0 `cat $pid_file` >/dev/null 2>&1; then
+    echo Stopping GEH Subscription...
+    kill -s INT `cat $pid_file`
+    tries_count=8
+    success=0
+    while [ $((tries_count-=1)) -ge 0 ]; do
+      if [ -e "$pid_file" ] >/dev/null 2>&1; then
+        sleep 1
+      else
+        success=1
+        break
+      fi
+    done
+    if [ $success -eq 0 ]; then
+      echo "killing GEH Subscription process..."
+      kill -s KILL `cat $pid_file`
+      rm -f $pid_file >/dev/null 2>&1
+    else
+      echo GEH Subscription has been stopped successfully.
+    fi
+  else
+    rm -f $pid_file >/dev/null 2>&1
+    echo GEH Subscription is not running.
+  fi
 }
 
 case "$1" in

data/lib/global_error_handler/redis_notification_subscriber.rb

@@ -35,7 +35,7 @@ module GlobalErrorHandler
           puts "##{Process.pid}: #{error}, retrying in 1s"
           sleep 1
           retry
-        rescue Interrupt => error
+        rescue Interrupt
           puts "##{Process.pid}: unsubscribing..."
           unsubscribe!
           redis.quit

data/lib/global_error_handler/version.rb

@@ -1,3 +1,3 @@
 module GlobalErrorHandler #:nodoc:
-  VERSION = '1.1.0'
+  VERSION = '1.2.3'
 end

data/lib/tasks/global_error_handler.rake

@@ -1,39 +1,55 @@
 namespace :global_error_handler do
   desc 'Subscribe to expired keyevent notifications'
   task subscribe_to_expired: :environment do
-    puts('*** pid file exists!') || next if File.exist?(pid_file)
+    if pid_file_exists?
+      begin
+        Process.kill 0, process_id
+        puts '*** already running!'
+        next
+      rescue Errno::ESRCH
+      end
+    end
+
     File.open(pid_file, 'w') { |f| f.puts Process.pid }
+
     begin
       GlobalErrorHandler::RedisNotificationSubscriber.subscribe!
     ensure
-      begin
-        File.unlink pid_file
-      rescue
-        nil
-      end
+      File.unlink(pid_file) rescue nil
     end
   end
 
   desc 'Unsubscribe from expired keyevent notifications'
   task unsubscribe_from_expired: :environment do
-    puts('*** pid file does not exist!') || next unless File.exist?(pid_file)
-    process_id = File.read(pid_file).to_i
+    puts('*** pid file does not exist!') || next unless pid_file_exists?
+
     begin
       Process.kill 0, process_id
       GlobalErrorHandler::RedisNotificationSubscriber.unsubscribe!
-      puts "** Terminating ##{process_id}..."
-      Timeout.timeout(10) { Process.kill 15, process_id }
-    rescue Timeout::Error
-      puts "** Killing ##{process_id} after waiting for 10 seconds..."
-      Process.kill 9, process_id
+
+      term_signals = [2, 3, 15, 9].to_enum
+      begin
+        puts "** Sending signal #{term_signals.peek} to ##{process_id}..."
+        Process.kill(term_signals.next, process_id)
+
+        i_try = 0
+        while i_try <= 3
+          Process.kill 0, process_id
+          i_try += 1
+          sleep 1
+          raise RetryIteration if i_try == 3
+        end
+      rescue RetryIteration
+        retry
+      rescue StopIteration
+        puts '*** failed to stop a process!'
+      rescue Errno::ESRCH, Errno::ENOENT
+        puts '*** successfully stopped!'
+      end
     rescue Errno::ESRCH
       puts "** No such process ##{process_id}. Exiting..."
     ensure
-      begin
-        File.unlink pid_file
-      rescue
-        nil
-      end
+      File.unlink(pid_file) rescue nil
     end
   end
 
@@ -44,7 +60,27 @@ namespace :global_error_handler do
     puts '** completed CleanUp process.'
   end
 
+  class RetryIteration < StandardError; end
+
+  def pid_location
+    pid_dir = [
+      File.join(Rails.root, '..', 'shared', 'pids'),
+      File.join(Rails.root, '..', '..', 'shared', 'pids'),
+      File.join(Rails.root, 'tmp', 'pids')
+    ].detect { |dir_name| Dir.exist?(dir_name) }
+
+   File.expand_path pid_dir
+  end
+
   def pid_file
-    @pid_file ||= File.expand_path('./tmp/pids/global_error_handler_subscription.pid')
+    @pid_file ||= File.join(pid_location, 'global_error_handler_subscription.pid')
+  end
+
+  def process_id
+    File.read(pid_file).to_i
+  end
+
+  def pid_file_exists?
+    File.exist? pid_file
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: global_error_handler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.3
 platform: ruby
 authors:
 - Andrii Rudenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler