procodile 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6afcf104b9bc4268bc21c634075b7cd4c8ef8d33
-  data.tar.gz: a46fd5857741a36d7d2584a4d4cea4ed07c5dbfa
+  metadata.gz: e1bd3a47f7f701a8430b69a48bb9f114a6e6f7a8
+  data.tar.gz: e1df71b29eb1f5836132539beb2691a85f390301
 SHA512:
-  metadata.gz: 85ea38210c9cf42dde381b7ed2a8966578047356cfdd6deed42942ea49f6880a8fb32317b00d98586054925ab7d8acbcc716577db27b1a8796aaa506dd195a7a
-  data.tar.gz: d43970fcd524920fae6d7980546de10c9f0980354d8e80cf33d2569d8d90253ce1cafd7b85d98db865aac982aaf9ca61123492d0f774f798d7ad0d16024cc3fb
+  metadata.gz: f09564099dc0dabd736a48677b7f475a6ef1d723f95aabcd9c7470277ad6d411da63b75ba02041ef4f9c3d5dfb6425c0296019cb216a3489437e67b42ba0e83c
+  data.tar.gz: 4fe1b93764fb2a2c041d55ce996ebd6003c71df83d14da3540a3184ceae9566ed7fff0a32c8b37ec7637dd98f0a1dbf8bbb0847f0462cb3f5c0bcb990f3ab413

data/bin/procodile

@@ -1,6 +1,24 @@
 #!/usr/bin/env ruby
-$:.unshift(File.expand_path('../../lib', __FILE__))
 
+require 'yaml'
+global_config_path = ENV['PROCODILE_CONFIG'] || "/etc/procodile"
+if File.exist?(global_config_path)
+  global_config = YAML.load_file(global_config_path)
+else
+  global_config = {}
+end
+
+if global_config['user'] && ENV['USER'] != global_config['user']
+  if global_config['user_reexec']
+    $stderr.puts "\e[31mProcodile must be run as #{global_config['user']}. Re-executing as #{global_config['user']}...\e[0m"
+    exec "sudo -u #{global_config['user']} -- #{$0} #{ARGV.join(' ')}"
+  else
+    $stderr.puts "\e[31mError: Procodile must be run as #{global_config['user']}\e[0m"
+    exit 1
+  end
+end
+
+$:.unshift(File.expand_path('../../lib', __FILE__))
 require 'optparse'
 require 'fileutils'
 require 'procodile'
@@ -33,7 +51,7 @@ end
 
 begin
   if command != 'help'
-    cli.config = Procodile::Config.new(options[:root] ? File.expand_path(options[:root]) : FileUtils.pwd)
+    cli.config = Procodile::Config.new(options[:root] ? File.expand_path(options[:root]) : global_config['root'] || FileUtils.pwd)
   end
   cli.run(command)
 rescue Procodile::Error => e

data/lib/procodile/instance.rb

@@ -46,6 +46,7 @@ module Procodile
     #
     def environment_variables
       vars = @process.environment_variables.merge({
+        'PROC_NAME' => self.description,
         'PID_FILE' => self.pid_file_path,
         'APP_ROOT' => @process.config.root
       })
@@ -188,6 +189,7 @@ module Procodile
       when 'usr1', 'usr2'
         if running?
           ::Process.kill(@process.restart_mode.upcase, @pid)
+          @tag = @supervisor.tag if @supervisor.tag
           Procodile.log(@process.log_color, description, "Sent #{@process.restart_mode.upcase} signal to process #{@pid}")
         else
           Procodile.log(@process.log_color, description, "Process not running already. Starting it.")

data/lib/procodile/supervisor.rb

@@ -228,19 +228,18 @@ module Procodile
       {:started => [], :stopped => []}.tap do |status|
         @processes.each do |process, instances|
           next if processes && !processes.include?(process.name)
-          active_instances = instances.select(&:running?)
 
           if type == :both || type == :stopped
-            if active_instances.size > process.quantity
-              quantity_to_stop = active_instances.size - process.quantity
+            if instances.size > process.quantity
+              quantity_to_stop = instances.size - process.quantity
               Procodile.log nil, "system", "Stopping #{quantity_to_stop} #{process.name} process(es)"
-              status[:stopped] = active_instances.last(quantity_to_stop).each(&:stop)
+              status[:stopped] = instances.last(quantity_to_stop).each(&:stop)
             end
           end
 
           if type == :both || type == :started
-            if active_instances.size < process.quantity
-              quantity_needed = process.quantity - active_instances.size
+            if instances.size < process.quantity
+              quantity_needed = process.quantity - instances.size
               Procodile.log nil, "system", "Starting #{quantity_needed} more #{process.name} process(es)"
               status[:started] = process.generate_instances(self, quantity_needed).each(&:start)
             end

data/lib/procodile/version.rb

@@ -1,3 +1,3 @@
 module Procodile
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procodile
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json