procodile 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2df02f31fea5565a5b982cd4d1ae98b53e6256d
-  data.tar.gz: a758543c9bb33dbe1f5520c0d38ad9c128cb1255
+  metadata.gz: 1f9970119b9f9480ad0894234851c37b852fa29b
+  data.tar.gz: 22e30024ec12580a2469d89520c28a03465e4e49
 SHA512:
-  metadata.gz: f2ef597c33f6475992e64d577b543d50b4b70da16e634afd61a3a74339cdca4b1cdb20f7ba2bf8ca79939a1b5e0d1d132d0f61ccd4b08f4ae41c528377f7dc81
-  data.tar.gz: f6bdaa3e8caccccb8a6761536f5f8e77ad7911fd4f0b63f5bb0f318228c29ceec671011622816a4573be0c67411585167dbacfe541d2721a41bad75b95f3bd39
+  metadata.gz: 70036e03d4e9940d8460540302b91ebd0d94d70dfac2a8d73bf4ad29a4753bc9a4ed2c5e3c35f69bc7bdb4e707c019c86138da406ada41774f66c189a98bd79e
+  data.tar.gz: b8740fbfa8d2ceff5b0f053abef7e8958f934f1d7aaf636aeb18e3195685f58246166c82afd7f87178f4c8f31b3c372df5650236972e448b860609cfc15184f3

data/lib/procodile/cli.rb

@@ -432,12 +432,10 @@ module Procodile
 
     def supervisor_running?
       if pid = current_pid
-        ::Process.getpgid(pid) ? true : false
+        self.class.pid_active?(pid)
       else
         false
       end
-    rescue Errno::ESRCH
-      false
     end
 
     def current_pid
@@ -449,6 +447,12 @@ module Procodile
       end
     end
 
+    def self.pid_active?(pid)
+      ::Process.getpgid(pid) ? true : false
+    rescue Errno::ESRCH
+      false
+    end
+
     def process_names_from_cli_option
       if @options[:processes]
         processes = @options[:processes].split(',')
@@ -475,6 +479,8 @@ module Procodile
       run_options[:force_single_log] = options[:foreground]
       run_options[:port_allocations] = options[:port_allocations]
 
+      tidy_pids(config)
+
       if options[:clean]
         FileUtils.rm_rf(Dir[File.join(config.pid_root, '*')])
         puts "Emptied PID directory"
@@ -503,5 +509,21 @@ module Procodile
       end
     end
 
+    def self.tidy_pids(config)
+      FileUtils.rm_f(config.supervisor_pid_path)
+      FileUtils.rm_f(config.sock_path)
+      pid_files = Dir[File.join(config.pid_root, '*.pid')]
+      pid_files.each do |pid_path|
+        file_name = pid_path.split('/').last
+        pid = File.read(pid_path).to_i
+        if self.pid_active?(pid)
+          puts "Could not remove #{file_name} because process (#{pid}) was active"
+        else
+          FileUtils.rm_f(pid_path)
+          puts "Removed #{file_name} because process was not active"
+        end
+      end
+    end
+
   end
 end

data/lib/procodile/version.rb

@@ -1,3 +1,3 @@
 module Procodile
-  VERSION = '1.0.15'
+  VERSION = '1.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This gem will help you run Ruby processes from a Procfile on Linux servers