eye 0.8.1 → 0.9.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcb8b4869dbc05dd43d8689f3dac2e2568da2836
-  data.tar.gz: 812fb5390734850ae80aa61515f1b989eaa7dfdb
+  metadata.gz: e50d71e8909ed2df73bede83562f4254f374fa99
+  data.tar.gz: 2328cd9e596a36e42763514bf9c09190f7e7dc36
 SHA512:
-  metadata.gz: fb16b8809575fe414f6cce0375071badf60e77b5ede06a4f7e941d4f9dd630c9f010bc3a669106e5789a959f66244df9ca505b8b6b9d1a49f8e5a7dc7302603d
-  data.tar.gz: 994e3f4a5444b59ac5d9e33ee7a5d786ef9d1e457b4d161ddc1fa54765b6d7b69a1843fe24a70273019def28fb4b8c0425d7ed516f804fe225d1c6e8029e47a0
+  metadata.gz: 675c027af39891e72aa31101cdcc18eeeeb3f8e5b04e7ef56e67e88a49f6e703efaf8301a9f8c8aa9d0d20c3c6467b5c172e6e9e9b4b5b39c850b2789d52e314
+  data.tar.gz: 2b5f93e6d191f4f65d560f54d46ffef5ba95b555f4d3911509ed9828645e9d877813864f938b5dab7aa3c85ef9ae8374583bf19987c9120447f81d55dc11721a

data/.gitignore

@@ -37,3 +37,4 @@ script
 /vendor/
 *.gz
 .eye
+.DS_Store

data/.rubocop.yml

@@ -5,6 +5,25 @@ AllCops:
     - 'spec/**/*'
     - 'lib/eye/utils/mini_active_support.rb'
 
+Performance/RedundantBlockCall:
+  Exclude:
+    - 'lib/eye/process/watchers.rb'
+
+Style/NumericPredicate:
+  EnforcedStyle: comparison
+
+Style/TernaryParentheses:
+  Exclude:
+    - 'lib/eye/cli/render.rb'
+
+Style/MutableConstant:
+  Exclude:
+    - 'lib/eye.rb'
+    - 'examples/**/*'
+    - 'lib/eye/trigger.rb'
+    - 'lib/eye/checker.rb'
+    - 'lib/eye/notify.rb'
+
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
 
@@ -69,7 +88,7 @@ Metrics/BlockNesting:
     - 'lib/eye/trigger/starting_guard.rb'
 
 Metrics/MethodLength:
-  Max: 45
+  Max: 50
 
 Metrics/CyclomaticComplexity:
   Max: 19
@@ -83,7 +102,7 @@ Metrics/ModuleLength:
     - 'lib/eye/process/commands.rb'
 
 Metrics/AbcSize:
-  Max: 60
+  Max: 65
 
 Style/GuardClause:
   MinBodyLength: 10

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - "2.0.0"
   - "2.1.7"
   - "2.2.3"
+  - "2.3.0"
 script:
-  - bundle exec rake N=16
+  - bundle exec rake N=15
   - bundle exec rubocop

data/Gemfile

@@ -1,2 +1,5 @@
 source 'https://rubygems.org'
 gemspec
+
+gem 'rack', '1.6.4'
+gem 'json', '1.8.3'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2015 'Konstantin Makarchev'
+Copyright (c) 2012-2016 'Konstantin Makarchev'
 
 MIT License
 

data/README.md

@@ -136,7 +136,7 @@ foreground load:
 
 If the eye daemon has already started and you call the `load` command, the config will be updated (into eye daemon). New objects(applications, groups, processes) will be added and monitored. Processes removed from the config will be removed (and stopped if the process has `stop_on_delete true`). Other objects will update their configs.
 
-Two global configs loaded by default, if it exists (with the first eye load):
+Two global configs loaded by default, if they exist (with the first eye load):
 
     /etc/eye.conf
     ~/.eyeconfig

data/bin/loader_eye

@@ -52,7 +52,7 @@ config = File.expand_path(config) if config && !config.empty?
 Eye::Control # preload
 
 if config
-  res = server.command('load', config)
+  res = Eye::Control.command('load', config)
   exit(1) if res.values.any? { |r| r[:error] }
 end
 

data/examples/delayed_job.eye

@@ -1,6 +1,6 @@
-cwd = File.expand_path(File.join(File.dirname(__FILE__), %w[ ../ ../ ]))
+cwd = File.expand_path(File.join(File.dirname(__FILE__), %w[../ ../]))
 
-config_path = File.join(cwd, %w[ config dj.yml ])
+config_path = File.join(cwd, %w[config dj.yml])
 
 workers_count = if File.exist?(config_path)
   YAML.load_file(config_path).try(:[], :workers) || 5

data/examples/processes/sample.rb

@@ -6,7 +6,7 @@ require 'optparse'
 # OptionParser.
 options = {}
 
-optparse = OptionParser.new do|opts|
+optparse = OptionParser.new do |opts|
   # This displays the help screen, all programs are
   # assumed to have this option.
   opts.on('-h', '--help', 'Display this screen') do

data/examples/puma.eye

@@ -1,6 +1,6 @@
 BUNDLE = 'bundle'
 RAILS_ENV = 'production'
-ROOT = File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
+ROOT = File.expand_path(File.join(File.dirname(__FILE__), %w[processes]))
 
 Eye.config do
   logger "#{ROOT}/eye.log"

data/examples/rbenv.eye

@@ -1,6 +1,6 @@
 Eye.application 'rbenv_example' do
   env 'RBENV_ROOT' => '/usr/local/rbenv', 'PATH' => "/usr/local/rbenv/shims:/usr/local/rbenv/bin:#{ENV['PATH']}"
-  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[processes]))
 
   process 'some_process' do
     pid_file 'some.pid'

data/examples/sidekiq.eye

@@ -16,7 +16,7 @@ def sidekiq_process(proxy, name)
 end
 
 Eye.application :sidekiq_test do
-  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[processes]))
   env 'RAILS_ENV' => 'production'
 
   sidekiq_process self, :sidekiq

data/examples/test.eye

@@ -14,7 +14,7 @@ Eye.application 'test' do
   # uid "user_name" # run app as a user_name (optional) - available only on ruby >= 2.0
   # gid "group_name" # run app as a group_name (optional) - available only on ruby >= 2.0
 
-  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[processes]))
   stdall 'trash.log' # stdout,err logs for processes by default
   env 'APP_ENV' => 'production' # global env for each processes
   trigger :flapping, times: 10, within: 1.minute, retry_in: 10.minutes

data/examples/thin-farm.eye

@@ -8,7 +8,7 @@ Eye.config do
 end
 
 Eye.app 'thin-farm' do
-  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[processes]))
   env 'RAILS_ENV' => 'production'
 
   # more about stop_on_delete: https://github.com/kostya/eye/wiki/About-stop_on_delete-=-true

data/examples/unicorn.eye

@@ -9,7 +9,7 @@ Eye.application 'rails_unicorn' do
   # unicorn requires to be `ruby` in path (for soft restart)
   env 'PATH' => "#{File.dirname(RUBY)}:#{ENV['PATH']}"
 
-  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
+  working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[processes]))
 
   process('unicorn') do
     pid_file 'tmp/pids/unicorn.pid'

data/eye.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'celluloid',     '~> 0.17.3'
   gem.add_dependency 'celluloid-io',  '~> 0.17.0'
-  gem.add_dependency 'state_machine'
+  gem.add_dependency 'state_machines'
   gem.add_dependency 'thor'
   gem.add_dependency 'sigar', '~> 0.7.3'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '< 2.14'
-  gem.add_development_dependency 'rr'
+  gem.add_development_dependency 'rr', '1.1.2'
   gem.add_development_dependency 'ruby-graphviz'
   gem.add_development_dependency 'forking'
   gem.add_development_dependency 'fakeweb'

data/lib/eye.rb

@@ -1,6 +1,6 @@
 module Eye
-  VERSION   = '0.8.1'
-  ABOUT     = "Eye v#{VERSION} (c) 2012-2015 @kostya"
+  VERSION   = '0.9.pre'
+  ABOUT     = "Eye v#{VERSION} (c) 2012-2016 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 
   autoload :Process,        'eye/process'
@@ -19,7 +19,6 @@ module Eye
   autoload :Utils,          'eye/utils'
   autoload :Notify,         'eye/notify'
   autoload :Config,         'eye/config'
-  autoload :Reason,         'eye/reason'
   autoload :Sigar,          'eye/sigar'
   autoload :Controller,     'eye/controller'
   autoload :Control,        'eye/control'

data/lib/eye/application.rb

@@ -38,12 +38,9 @@ class Eye::Application
   def debug_data
   end
 
-  def send_command(command, *args)
-    info "send_command #{command}"
-
-    @groups.each do |group|
-      group.send_command(command, *args)
-    end
+  def send_call(call)
+    info "call: #{call}"
+    @groups.each { |group| group.send_call(call) }
   end
 
   def alive?

data/lib/eye/checker.rb

@@ -130,6 +130,7 @@ class Eye::Checker
     result
 
   rescue Object => ex
+    raise(ex) if ex.class == Celluloid::TaskTerminated
     log_ex(ex)
   end
 
@@ -192,11 +193,11 @@ class Eye::Checker
     process.notify :warn, "Bounded #{check_name}: #{last_human_values} send to #{actions}"
 
     actions.each do |action|
-      reason = Eye::Reason.new("bounded #{check_name}")
+      reason = "bounded #{check_name}"
       if action.is_a?(Proc)
-        process.schedule :execute_proc, reason, &action
+        process.schedule command: :instance_exec, reason: reason, block: action
       else
-        process.schedule action, reason
+        process.schedule command: action, reason: reason
       end
     end
   end

data/lib/eye/checker/children_count.rb

@@ -14,7 +14,7 @@ class Eye::Checker::ChildrenCount < Eye::Checker::Measure
       super
     else
       pids = ordered_by_date_children_pids
-      pids = (strategy == :kill_old) ? pids[0...-below] : pids[below..-1]
+      pids = strategy == :kill_old ? pids[0...-below] : pids[below..-1]
       kill_pids(pids)
     end
   end
@@ -25,14 +25,14 @@ private
     info "killing pids: #{pids.inspect} for strategy: #{strategy}"
     pids.each do |pid|
       if child = process.children[pid]
-        child.schedule :stop, Eye::Reason.new("bounded #{check_name}")
+        child.schedule command: :stop, reason: "bounded #{check_name}"
       end
     end
   end
 
   def ordered_by_date_children_pids
     children = process.children.values
-    children.sort_by { |ch| Eye::SystemResources.start_time(ch.pid).to_i }.map(&:pid)
+    children.sort_by { |ch| [Eye::SystemResources.start_time(ch.pid).to_i, ch.pid] }.map(&:pid)
   end
 
 end

data/lib/eye/checker/socket.rb

@@ -52,11 +52,8 @@ class Eye::Checker::Socket < Eye::Checker::Defer
         { result: result }
       end
     rescue Timeout::Error
-      if protocol == :raw
-        return { result: @buffer }
-      else
-        return { exception: "ReadTimeout<#{@read_timeout}>" }
-      end
+      return { result: @buffer } if protocol == :raw
+      { exception: "ReadTimeout<#{@read_timeout}>" }
     end
 
   rescue Exception => e
@@ -103,14 +100,12 @@ class Eye::Checker::Socket < Eye::Checker::Defer
       '-'
     elsif value[:exception]
       value[:exception]
+    elsif value[:result] == :listen
+      'listen'
     else
-      if value[:result] == :listen
-        'listen'
-      else
-        res = "#{value[:result].to_s.size}b"
-        res += "<#{value[:notice]}>" if value[:notice]
-        res
-      end
+      res = "#{value[:result].to_s.size}b"
+      res += "<#{value[:notice]}>" if value[:notice]
+      res
     end
   end
 

data/lib/eye/child_process.rb

@@ -25,19 +25,21 @@ class Eye::ChildProcess
   # scheduler
   include Eye::Process::Scheduler
 
-  attr_reader :pid, :name, :full_name, :config, :watchers, :parent
+  attr_reader :pid, :name, :full_name, :config, :watchers
 
   def initialize(pid, config = {}, logger_prefix = nil, parent = nil)
     raise 'Empty pid' unless pid
 
     @pid = pid
-    @parent = parent
     @config = prepare_config(config)
     @name = "child-#{pid}"
     @full_name = [logger_prefix, @name].join(':')
 
     @watchers = {}
 
+    @scheduler_history = parent.scheduler_history
+    @parent_pid = parent.pid
+
     debug { "start monitoring CHILD config: #{@config.inspect}" }
 
     start_checkers
@@ -55,10 +57,6 @@ class Eye::ChildProcess
     state == :up
   end
 
-  def send_command(command, *args)
-    schedule command, *args, Eye::Reason::User.new(command)
-  end
-
   def start
   end
 
@@ -97,7 +95,7 @@ class Eye::ChildProcess
   end
 
   def prepare_command(command) # override
-    super.gsub('{PARENT_PID}', @parent.pid.to_s)
+    super.gsub('{PARENT_PID}', @parent_pid.to_s)
   end
 
 end

data/lib/eye/cli.rb

@@ -16,9 +16,11 @@ class Eye::Cli < Thor
   desc 'info [MASK]', 'processes info'
   method_option :json, type: :boolean, aliases: '-j'
   method_option :procline, type: :boolean, aliases: '-p'
+  method_option :debug, type: :boolean, aliases: '-d'
   def info(mask = nil)
     h = {}
     h[:procline] = true if options[:procline]
+    h[:debug] = true if options[:debug]
 
     res = cmd(:info_data, *Array(mask), h)
     if mask && res[:subtree] && res[:subtree].empty?
@@ -203,6 +205,10 @@ class Eye::Cli < Thor
     send_command(:user_command, cmd, *args)
   end
 
+  def self.exit_on_failure?
+    true
+  end
+
 private
 
   def error!(msg)
@@ -229,8 +235,4 @@ private
     say JSON.dump(obj)
   end
 
-  def self.exit_on_failure?
-    true
-  end
-
 end

data/lib/eye/cli/commands.rb

@@ -7,7 +7,7 @@ private
   end
 
   def _cmd(cmd, *args)
-    client.command(cmd, *args)
+    client.execute(command: cmd, args: args)
   rescue Errno::ECONNREFUSED, Errno::ENOENT
     :not_started
   end

data/lib/eye/cli/render.rb

@@ -58,11 +58,11 @@ private
       data.each do |k, v|
         s << "#{"#{k}:".ljust(10)} "
 
-        case k
+        s << case k
           when :resources
-            s << resources_str(v)
+            resources_str(v)
           else
-            s << "#{v}"
+            v.to_s
         end
 
         s << "\n"
@@ -106,8 +106,6 @@ private
     "#{at} - #{state} (#{h[:reason]})\n"
   end
 
-private
-
   def render_element(data, level)
     off = level * 2
     off_str = ' ' * off
@@ -131,6 +129,9 @@ private
       if data[:state_reason] && data[:state] == 'unmonitored'
         str += " (#{data[:state_reason]} at #{Eye::Utils.human_time2(data[:state_changed_at])})"
       end
+      if debug = data[:debug]
+        str += " (#{debug.inspect})"
+      end
     elsif data[:current_command]
       chain_progress = if data[:chain_progress]
         " #{data[:chain_progress][0]} of #{data[:chain_progress][1]}" rescue ''

data/lib/eye/client.rb

@@ -9,12 +9,17 @@ class Eye::Client
     @socket_path = socket_path
   end
 
-  def command(cmd, *args)
-    attempt_command(Marshal.dump([cmd, *args]))
+  def execute(h = {})
+    payload = Marshal.dump(h)
+    payload = payload.length.to_s + "\n" + payload
+    timeout = h[:timeout] || Eye::Local.client_timeout
+    attempt_command(payload, timeout)
   end
 
-  def attempt_command(pack)
-    Timeout.timeout(Eye::Local.client_timeout) { send_request(pack) }
+private
+
+  def attempt_command(payload, timeout)
+    Timeout.timeout(timeout) { send_request(payload) }
   rescue Timeout::Error, EOFError
     :timeouted
   end