eye 0.5.2 → 0.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: cafc3688088df4ed7d7e3dc818098b62409f048d
-  data.tar.gz: 956fe8cad209a7eda5eb2fe8ddc9114d37ea32e3
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTRhNjdkYTZkYmFlMmJmNGJmMGUzNWM4N2ViZjAyOWZiODhiOThkNA==
+  data.tar.gz: !binary |-
+    MzFiZDcwZjM4NTg4Y2QwNDI4NjgxZmU4MGQxZjEzMzQxYmJiZDY5Mw==
 SHA512:
-  metadata.gz: 6714b130ff87b60ad3f7ad768d4854e73b78aea6bf5f3c7374db183374cd608122cff1bc604e5f59e6e2482cc44aca303c12b40dc05b82f95ede1c88e89e0d3c
-  data.tar.gz: d64d70d355dc8580d77d575d102eded7fe7dc25d78aff325db363a42a161fc73f55f210071ae30901849bf7ba724e78fa5d12eba56a2eb59532b94bd3c2c737f
+  metadata.gz: !binary |-
+    Zjk2MzM3ODlmMTA4ZTE4OTUzNTJkMTY3YzEzNTY5ZGM1ZmI4YWYzYjFiMjJk
+    N2RmMzJmNWE1ZDcyNzkyYmE1ZDhlNjM1ZTcxNzFmMmRlZmQ5YTVlNDE3NzNm
+    MGNlNmQwZDc1MzNjN2JlYzFjNWI5MDgyYWNmZDYyMjc0ZDRiNTE=
+  data.tar.gz: !binary |-
+    MzRkYjE1M2FhN2Q4YmQyMDk0Y2Q3ZjYxN2Y2YmQwYTMwODM5YmJjMzI3Nzlh
+    NTFmMjA2MTc1OTk2ODA4Y2FkZjRjYTMwZGNlNmEyYWMzYTJlMTJiYmI4Y2Iw
+    YmQyODZjMzVlMzliZWNmNzVjNDAxZGU5YTM4YmVkNmRiMmJiY2M=

data/.travis.yml

@@ -1,11 +1,6 @@
 language: ruby
 rvm:
-  - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-  - "2.1.0"
+  - "2.1"
 script: bundle exec rake N=15
-#before_script:
-#  - bundle exec rake remove_coverage
-#after_script:
-#  - bundle exec rake coveralls:push

data/CHANGES.md

@@ -1,3 +1,15 @@
+0.6
+------
+* add processes dependencies (#43)
+* add eye-http gem (https://github.com/kostya/eye-http)
+* add eye plugin example (https://github.com/kostya/eye/tree/master/examples/plugin)
+* add quit option --stop_all (#39)
+* add local eye runner (like foreman, used Eyefile)
+* add use_leaf_child monitoring strategy (to daemonize sh -c '...') (788488a)
+* add children_count, children_memory checks
+* add dsl default application options (__default__)
+* trusting external pid_file changes (#52)
+
 0.5.2
 -----
 * rename dsl :childs_update_period to :children_update_period

data/README.md

@@ -185,6 +185,7 @@ Log tracing (tail and grep):
 Quit monitoring:
 
     $ eye q(uit)
+    $ eye q -s # stop all processes and quit
 
 Interactive info:
 
@@ -204,4 +205,8 @@ Process states and events:
 [![Eye](https://raw.github.com/kostya/stuff/master/eye/mprocess.png)](https://raw.github.com/kostya/stuff/master/eye/process.png)
 
 
+EyeHttp Gem:
+
+    https://github.com/kostya/eye-http
+
 Thanks `Bluepill` for the nice config ideas.

data/Rakefile

@@ -7,10 +7,10 @@ require 'coveralls/rake/task'
 
 Coveralls::RakeTask.new
 
-task :default => :pspecs
+task :default => :pspec
 
-task :pspecs do
-  Rake::Task['parallel:spec'].invoke(ENV['N'] || 8)
+task :pspec do
+  Rake::Task['parallel:spec'].invoke(ENV['N'] || 10)
 end
 
 RSpec::Core::RakeTask.new(:spec) do |t|
@@ -26,7 +26,7 @@ task :env do
   require 'bundler/setup'
   require 'eye'
   Eye::Controller
-  Eye::Process # preload
+  Eye::Process
 end
 
 desc "graph"

data/bin/loader_eye

@@ -24,6 +24,15 @@ OptionParser.new do |opts|
     options[:logger] = logger
   end
 
+  opts.on( '-dr', '--dir DIR', 'Dir for local runner' ) do |dir|
+    Eye::Local.dir = dir
+    Eye::Local.local_runner = true
+  end
+
+  opts.on( '-st', '--stop_all', 'Stop all on exit' ) do |stop_all|
+    options[:stop_all] = true
+  end
+
   opts.on( '-d', '--debug', 'debug info to logger' ) do
     options[:debug] = true
   end
@@ -52,8 +61,10 @@ Eye::Control.set_proc_line
 
 server.async.run
 
-trap("INT"){ exit }
-trap("USR1"){ Eye::Logger.reopen }
-trap("USR2"){ GC.start }
+trap("USR1") { Eye::Logger.reopen }
+trap("USR2") { GC.start }
+trap("INT")  { exit }
+
+at_exit { Eye::Control.command(:stop_all) } if options[:stop_all]
 
 sleep

data/bin/runner

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib]))
+require 'eye'
+
+# Local version of eye
+#  which looking for Eyefile
+#  like foreman
+
+unless Eye::Local.eyefile
+  puts "Not found Eyefile"
+  exit 1
+end
+
+Eye::Local.dir = File.dirname(Eye::Local.eyefile)
+Eye::Local.local_runner = true
+Eye::Cli.start

data/examples/dependency.eye

@@ -0,0 +1,17 @@
+# process dependencies :b -> :a
+
+Eye.app :dependency do
+  process(:a) do
+    start_command "sleep 100"
+    daemonize true
+    pid_file "/tmp/test_process_a.pid"
+  end
+
+  process(:b) do
+    start_command "sleep 100"
+    daemonize true
+    pid_file "/tmp/test_process_b.pid"
+    depend_on :a
+  end
+
+end

data/examples/plugin/README.md

@@ -0,0 +1,15 @@
+Eye Plugin Example
+------------------
+
+This plugin adds reactor which try to reads command from file "/tmp/cmd.txt" every 1.second (then execute it and delete file). Also plugin add trigger to save every process state transition into "/tmp/saver.log".
+
+To test it:
+
+    bundle exec eye l examples/plugin/main.eye
+    tail -f /tmp/eye.log
+    tail -f /tmp/saver.log
+    echo 'restart' > /tmp/cmd.txt
+
+Also, here http example of gem:
+
+    https://github.com/kostya/eye-http

data/examples/plugin/main.eye

@@ -0,0 +1,15 @@
+Eye.load('./plugin.rb')
+
+Eye.config do
+  logger "/tmp/eye.log"
+  enable_reactor(1.second, "/tmp/cmd.txt")
+  enable_saver("/tmp/saver.log")
+end
+
+Eye.app :app do
+  process :process do
+    pid_file "/tmp/p.pid"
+    start_command "sleep 10"
+    daemonize true
+  end
+end

data/examples/plugin/plugin.rb

@@ -0,0 +1,63 @@
+class Reactor
+  include Celluloid
+
+  def initialize(interval, filename)
+    @interval = interval
+    @filename = filename
+    every(@interval) do
+      info "check file #{@filename}"
+      if cmd = read_file
+        execute_command cmd
+      end
+    end
+  end
+
+  def read_file
+    if File.exists?(@filename)
+      cmd = File.read(@filename).chop
+      File.delete(@filename) rescue nil
+      cmd
+    end
+  end
+
+  def execute_command(cmd)
+    Eye::Control.command(cmd, 'all') if %w{restart start stop}.include?(cmd)
+  end
+end
+
+class Saver < Eye::Trigger::Custom
+  param :log_name, String, true
+
+  def check(trans)
+    tlogger.info "#{process.full_name} transition from #{trans.from_name} to #{trans.to_name}"
+  end
+
+  def tlogger
+    @tlogger ||= Logger.new(log_name)
+  end
+end
+
+def reactor
+  Celluloid::Actor[:reactor]
+end
+
+# Extend config options, add enable_reactor
+class Eye::Dsl::ConfigOpts
+  def enable_reactor(*args)
+    @config[:reactor] = args
+  end
+
+  def enable_saver(save_log)
+    Eye.application '__default__' do
+      trigger :saver, :log_name => save_log
+    end
+  end
+end
+
+# extend controller to execute method, and config loads
+class Eye::Controller
+  def set_opt_reactor(args)
+    reactor.terminate if reactor
+    Celluloid::Actor[:reactor] = Reactor.supervise(*args)
+  end
+end

data/examples/unicorn.eye

@@ -26,7 +26,7 @@ Eye.application "rails_unicorn" do
     check :cpu, :every => 30, :below => 80, :times => 3
     check :memory, :every => 30, :below => 150.megabytes, :times => [3,5]
 
-    start_timeout 30.seconds
+    start_timeout 100.seconds
     restart_grace 30.seconds
 
     monitor_children do

data/eye.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Eye::VERSION
   gem.license       = "MIT"
 
-  gem.required_ruby_version     = '>= 1.9.2' # because of celluloid
+  gem.required_ruby_version     = '>= 1.9.2'
   gem.required_rubygems_version = '>= 1.3.6'
 
   gem.add_dependency 'celluloid',     '~> 0.15.0'
@@ -37,5 +37,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'xmpp4r'
   gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'simplecov', '>= 0.8.1'
-  gem.add_development_dependency 'parallel_tests'
 end

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye
-  VERSION   = "0.5.2"
+  VERSION   = "0.6"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2014 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 

data/lib/eye/checker.rb

@@ -11,16 +11,19 @@ class Eye::Checker
   autoload :Nop,        'eye/checker/nop'
   autoload :Runtime,    'eye/checker/runtime'
   autoload :Cputime,    'eye/checker/cputime'
+  autoload :ChildrenCount, 'eye/checker/children_count'
+  autoload :ChildrenMemory,'eye/checker/children_memory'
 
   TYPES = {:memory => 'Memory', :cpu => 'Cpu', :http => 'Http',
            :ctime => 'FileCTime', :fsize => 'FileSize', :file_touched => 'FileTouched',
-           :socket => 'Socket', :nop => 'Nop', :runtime => 'Runtime', :cputime => 'Cputime' }
+           :socket => 'Socket', :nop => 'Nop', :runtime => 'Runtime', :cputime => 'Cputime',
+           :children_count => "ChildrenCount", :children_memory => "ChildrenMemory" }
 
   attr_accessor :value, :values, :options, :pid, :type, :check_count, :process
 
   param :every, [Fixnum, Float], false, 5
   param :times, [Fixnum, Array], nil, 1
-  param :fires, [Symbol, Array], nil, nil, [:stop, :restart, :unmonitor, :nothing, :start, :delete]
+  param :fires, [Symbol, Array], nil, nil, [:stop, :restart, :unmonitor, :start, :delete, :nothing, :notify]
   param :initial_grace, [Fixnum, Float]
   param :skip_initial_fails, [TrueClass, FalseClass]
 
@@ -37,7 +40,7 @@ class Eye::Checker
   def self.get_class(type)
     klass = eval("Eye::Checker::#{TYPES[type]}") rescue nil
     raise "Unknown checker #{type}" unless klass
-    if deps = klass.depends_on
+    if deps = klass.requires
       Array(deps).each { |d| require d }
     end
     klass
@@ -180,6 +183,15 @@ class Eye::Checker
     process.instance_exec(&p) if process.alive?
   end
 
+  def fire
+    actions = fires ? Array(fires) : [:restart]
+    process.notify :warn, "Bounded #{check_name}: #{last_human_values} send to #{actions}"
+
+    actions.each do |action|
+      process.schedule action, Eye::Reason.new("bounded #{check_name}")
+    end
+  end
+
   def defer(&block)
     Celluloid::Future.new(&block).value
   end
@@ -197,7 +209,7 @@ class Eye::Checker
     Eye::Checker.const_set(name, base)
   end
 
-  def self.depends_on
+  def self.requires
   end
 
   class CustomCell < Eye::Checker

data/lib/eye/checker/children_count.rb

@@ -0,0 +1,44 @@
+class Eye::Checker::ChildrenCount < Eye::Checker::Measure
+
+  # check :children_count, :every => 30.seconds, :below => 10, :strategy => :kill_old
+  #   monitor_children should be enabled
+
+  param :strategy, Symbol, nil, :restart, [:restart, :kill_old, :kill_new]
+
+  def get_value
+    process.children.size
+  end
+
+  def fire
+    if strategy == :restart
+      super
+    else
+      pids = ordered_by_date_children_pids
+
+      pids = if strategy == :kill_old
+        pids[0...-below]
+      else
+        pids[below..-1]
+      end
+
+      kill_pids(pids)
+    end
+  end
+
+private
+
+  def kill_pids(pids)
+    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}")
+      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
+  end
+
+end

data/lib/eye/checker/children_memory.rb

@@ -0,0 +1,12 @@
+class Eye::Checker::ChildrenMemory < Eye::Checker::Measure
+
+  # check :children_memory, :every => 30.seconds, :below => 400.megabytes
+  #   monitor_children should be enabled
+
+  def get_value
+    process.children.values.inject(0) do |sum, ch|
+      sum + Eye::SystemResources.memory(ch.pid).to_i
+    end
+  end
+
+end

data/lib/eye/checker/socket.rb

@@ -18,7 +18,7 @@ class Eye::Checker::Socket < Eye::Checker::Defer
   param :read_timeout,  [Fixnum, Float]
   param :send_data
   param :expect_data,   [String, Regexp, Proc]
-  param :protocol,      [Symbol], nil, nil, [:default, :em_object]
+  param :protocol,      [Symbol], nil, nil, [:default, :em_object, :raw]
 
   def initialize(*args)
     super
@@ -51,7 +51,11 @@ class Eye::Checker::Socket < Eye::Checker::Defer
           { :result => result }
         end
       rescue Timeout::Error
-        return { :exception => "ReadTimeout<#{@read_timeout}>" }
+        if protocol == :raw
+          return { :result => @buffer }
+        else
+          return { :exception => "ReadTimeout<#{@read_timeout}>" }
+        end
       end
     else
       { :result => :listen }
@@ -144,6 +148,9 @@ private
       if content.present?
         Marshal.load(content) rescue 'corrupted_marshal'
       end
+    when :raw
+      @buffer = ''
+      loop { @buffer << socket.recv(1) }
     else
       socket.readline.chop
     end

data/lib/eye/child_process.rb

@@ -26,10 +26,11 @@ class Eye::ChildProcess
 
   attr_reader :pid, :name, :full_name, :config, :watchers
 
-  def initialize(pid, config = {}, logger_prefix = nil)
+  def initialize(pid, config = {}, logger_prefix = nil, parent_pid = nil)
     raise 'Empty pid' unless pid
 
     @pid = pid
+    @parent_pid = parent_pid
     @config = prepare_config(config)
     @name = "child-#{pid}"
     @full_name = [logger_prefix, @name] * ':'
@@ -94,4 +95,7 @@ class Eye::ChildProcess
     self_status_data(debug)
   end
 
-end
+  def prepare_command(command) # override
+    super.gsub('{PARENT_PID}', @parent_pid.to_s)
+  end
+end