procodile 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b644b27235abc8fcae9bfd9d7ca9bbd87cd1c0d8
-  data.tar.gz: 82428a6110171a2b783f0a249b8bf6661e02c6e4
+  metadata.gz: af875e102a349ee27e1ae2e73f91b4f49c7e6c04
+  data.tar.gz: 478f4a32e80be0176df34a1365dd27713aa6a417
 SHA512:
-  metadata.gz: b4cbe1b3445fbb4fab8afd3cab8e1a90aa03b0e4c24de0daddd9823cdc756831ee096647d5a424e363e36808fb43709c73d5be763b09de5d6f805d7869275e26
-  data.tar.gz: 6363da66bd85396ffbd5bde9ad4ff64464535fd73f1f5b9c29b1a3d32b42ed4d2bf2f0343743d005438db85c730081c0a2827a9b5cc8a216ab9dd5d57a4880a6
+  metadata.gz: 609190d1c60c6eac36ffc008d9f8c12fe61164a1820db57e70b60de520e7e10cbb0a730799677227f47f2ecfaafba601a9f360131b327e04491c0ab4130ca3b7
+  data.tar.gz: 2d11514410c07c3f0bc59ccc79a0547692b4914bd189d030fa54ef0296b2d73b4298702440087af4d5431169154c0b8e6e3b0cc500310fabbd39549ce4a146f9

data/lib/procodile/cli.rb

@@ -122,12 +122,22 @@ module Procodile
           puts "||".color(process['log_color']) + " Command        " + process['command']
           puts "||".color(process['log_color']) + " Respawning     " + "#{process['max_respawns']} every #{process['respawn_window']} seconds"
           puts "||".color(process['log_color']) + " Restart mode   " + process['restart_mode']
-          stats['instances'][process['name']].each do |instance|
-            print "|| ".color(process['log_color']) + instance['description'].to_s.ljust(20, ' ').color(process['log_color'])
-            print "pid " + instance['pid'].to_s.ljust(12, ' ')
-            print (instance['running'] ? 'Running' : 'Stopped').to_s.ljust(15, ' ')
-            print instance['respawns'].to_s + " respawns"
-            puts
+          puts "||".color(process['log_color']) + " Log path       " + (process['log_path'] || "none specified")
+          instances = stats['instances'][process['name']]
+          if instances.empty?
+            puts "||".color(process['log_color']) + " No processes running."
+          else
+            instances.each do |instance|
+              print "|| ".color(process['log_color']) + instance['description'].to_s.ljust(20, ' ').color(process['log_color'])
+              if instance['running']
+                print ' Running '.color("42;37")
+              else
+                print ' Stopped '.color("41;37")
+              end
+              print "     pid " + instance['pid'].to_s.ljust(12, ' ')
+              print instance['respawns'].to_s + " respawns"
+              puts
+            end
           end
         end
       else

data/lib/procodile/control_client.rb

@@ -24,15 +24,19 @@ module Procodile
 
     def run(command, options = {})
       @socket.puts("#{command} #{options.to_json}")
-      code, reply = @socket.gets.strip.split(/\s+/, 2)
-      if code.to_i == 200
-        if reply && reply.length > 0
-          JSON.parse(reply)
+      if data = @socket.gets
+        code, reply = data.strip.split(/\s+/, 2)
+        if code.to_i == 200
+          if reply && reply.length > 0
+            JSON.parse(reply)
+          else
+            true
+          end
         else
-          true
+          raise Error, "Error from control server: #{code} (#{reply.inspect})"
         end
       else
-        raise Error, "Error from control server: #{code} (#{reply.inspect})"
+        raise Error ,"Control server disconnected."
       end
     end
 

data/lib/procodile/instance.rb

@@ -108,8 +108,8 @@ module Procodile
       @stopping = true
       update_pid
       if self.running?
-        Procodile.log(@process.log_color, description, "Sending TERM to #{@pid}")
-        ::Process.kill('TERM', pid)
+        Procodile.log(@process.log_color, description, "Sending #{@process.term_signal} to #{@pid}")
+        ::Process.kill(@process.term_signal, pid)
       else
         Procodile.log(@process.log_color, description, "Process already stopped")
       end
@@ -151,8 +151,8 @@ module Procodile
       when 'start-term'
         old_process_pid = @pid
         start
-        Procodile.log(@process.log_color, description, "Sent TERM signal to old PID #{old_process_pid} (forgetting now)")
-        ::Process.kill('TERM', old_process_pid)
+        Procodile.log(@process.log_color, description, "Sent #{@process.term_signal} signal to old PID #{old_process_pid} (forgetting now)")
+        ::Process.kill(@process.term_signal, old_process_pid)
       when 'term-start'
         stop
         Thread.new do
@@ -202,7 +202,7 @@ module Procodile
             add_respawn
           elsif respawns >= @process.max_respawns
             Procodile.log(@process.log_color, description, "\e[41;37mWarning:\e[0m\e[31m this process has been respawned #{respawns} times and keeps dying.\e[0m")
-            Procodile.log(@process.log_color, description, "It will not be respawned automatically any longer and will no longer be managed.").color(31)
+            Procodile.log(@process.log_color, description, "It will not be respawned automatically any longer and will no longer be managed.".color(31))
             tidy
             unmonitor
           end

data/lib/procodile/process.rb

@@ -46,6 +46,13 @@ module Procodile
       @options['log_path'] ? File.expand_path(@options['log_path'], @config.root) : nil
     end
 
+    #
+    # Return the signal to send to terminate the process
+    #
+    def term_signal
+      @options['term_signal'] || 'TERM'
+    end
+
     #
     # Defines how this process should be restarted
     #

data/lib/procodile/supervisor.rb

@@ -37,7 +37,7 @@ module Procodile
       Array.new.tap do |instances_started|
         @config.processes.each do |name, process|
           next if types && !types.include?(name.to_s) # Not a process we want
-          next if @processes.keys.include?(process)   # Process type already running
+          next if @processes[process] && !@processes[process].empty?   # Process type already running
           instances = start_instances(process.generate_instances)
           instances_started.push(*instances)
         end
@@ -117,7 +117,7 @@ module Procodile
       end
 
       # If the processes go away, we can stop the supervisor now
-      if @processes.size == 0
+      if @processes.all? { |_,instances| instances.size == 0 }
         Procodile.log nil, "system", "All processes have stopped"
         stop_supervisor
       end
@@ -185,7 +185,7 @@ module Procodile
     def remove_unmonitored_instances
       @processes.each do |_, instances|
         instances.reject!(&:unmonitored?)
-      end.reject! { |_, instances| instances.empty? }
+      end
     end
 
     def remove_stopped_instances
@@ -198,7 +198,7 @@ module Procodile
             false
           end
         end
-      end.reject! { |_, instances| instances.empty? }
+      end
     end
 
     def process_names_to_instances(names)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Cooke