bluepill 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c7760cf13b7c5d2f991f644fe1f762eca7853d3
-  data.tar.gz: 28dc84d8bf94f0e2c5318f9397190fd35f6b626e
+  metadata.gz: 6007963ed9836bc609625037bd170bed8057cf37
+  data.tar.gz: 0dbdd5043c20fad925290da16d63ef423b18ba83
 SHA512:
-  metadata.gz: 76da9cf314f0a7bb9f4181d895e321f9851bc801955e8bde47b10ec9b1ad6f41f8f0d58e9ef3c5f2d1144258272d772579e1fb3204d883cd71ed6ad9dcc076ee
-  data.tar.gz: e25c6b9194bcc135e1a08339b58584c2962e9bc81129c019a91e5d162f52d8eeea73f63bb8195a77cef9191bdc423270725da0a6b1fee39ba7dd9045ef0b5daa
+  metadata.gz: 3a19e7ac04e1373bf37f2fbbeeef3bf827260326aa73573028d735da2acf03517469c6f5442a55826198dbd7b6dffec73b35aafa80e89f53ad1a5708db2d95ad
+  data.tar.gz: bb395f534f3f5ed497ed76318fcd72c898ff4bf9ff508ea1e657cb5f94e0891e8fea81436241285d299f54e42bcc2cdb036d48a50fd6e198502d9a308c8ef9e6

data/lib/bluepill/controller.rb

@@ -23,17 +23,6 @@ module Bluepill
       case command.to_sym
       when :status
         puts send_to_daemon(application, :status, *args)
-      when *Application::PROCESS_COMMANDS
-        # these need to be sent to the daemon and the results printed out
-        affected = send_to_daemon(application, command, *args)
-        if affected.empty?
-          puts 'No processes effected'
-        else
-          puts "Sent #{command} to:"
-          affected.each do |process|
-            puts "  #{process}"
-          end
-        end
       when :quit
         pid = pid_for(application)
         if System.pid_alive?(pid)
@@ -52,6 +41,17 @@ module Bluepill
         tail = "tail -n 100 -f #{log_file_location} | grep -E '#{grep_pattern}'"
         puts "Tailing log for #{requested_pattern}..."
         Kernel.exec(tail)
+      when *Application::PROCESS_COMMANDS
+        # these need to be sent to the daemon and the results printed out
+        affected = send_to_daemon(application, command, *args)
+        if affected.empty?
+          puts 'No processes effected'
+        else
+          puts "Sent #{command} to:"
+          affected.each do |process|
+            puts "  #{process}"
+          end
+        end
       else
         $stderr.puts(format('Unknown command `%s` (or application `%s` has not been loaded yet)', command, command))
         exit(1)
@@ -86,7 +86,7 @@ module Bluepill
     def cleanup_bluepill_directory
       running_applications.each do |app|
         pid = pid_for(app)
-        next if pid || System.pid_alive?(pid)
+        next if pid && System.pid_alive?(pid)
         pid_file = File.join(pids_dir, "#{app}.pid")
         sock_file = File.join(sockets_dir, "#{app}.sock")
         System.delete_if_exists(pid_file)

data/lib/bluepill/process.rb

@@ -331,7 +331,7 @@ module Bluepill
             logger.warning result.inspect
           end
         end
-
+        cleanup_process
       elsif stop_signals
         # issue stop signals with configurable delay between each
         logger.warning "Sending stop signals to #{actual_pid}"
@@ -355,13 +355,13 @@ module Bluepill
             logger.info "Sending signal #{signal} to #{process.actual_pid}"
             process.signal_process(signal)
           end
+          cleanup_process
         end
       else
         logger.warning "Executing default stop command. Sending TERM signal to #{actual_pid}"
         signal_process('TERM')
+        cleanup_process
       end
-      ProcessJournal.kill_all_from_journal(name) # finish cleanup
-      unlink_pid # TODO: we only write the pid file if we daemonize, should we only unlink it if we daemonize?
 
       skip_ticks_for(stop_grace_time)
     end
@@ -389,6 +389,11 @@ module Bluepill
       end
     end
 
+    def cleanup_process
+      ProcessJournal.kill_all_from_journal(name) # finish cleanup
+      unlink_pid # TODO: we only write the pid file if we daemonize, should we only unlink it if we daemonize?
+    end
+
     def clean_threads
       @threads.each(&:kill)
       @threads.clear

data/lib/bluepill/system.rb

@@ -26,6 +26,8 @@ module Bluepill
       true
     rescue Errno::ESRCH
       false
+    rescue
+      false # other falsy (no pid)
     end
 
     def cpu_usage(pid, include_children)
@@ -197,7 +199,7 @@ module Bluepill
         result = {
           stdout: cmd_out_read.read,
           stderr: cmd_err_read.read,
-          exit_code: $CHILD_STATUS.exitstatus,
+          exit_code: $?.exitstatus,
         }
 
         # We're done with these ends of the pipes as well

data/lib/bluepill/version.rb

@@ -14,7 +14,7 @@ module Bluepill
 
     # @return [Integer]
     def patch
-      1
+      2
     end
 
     # @return [Integer, NilClass]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bluepill
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Arya Asemanfar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A process monitor written in Ruby with stability and minimalism in mind.