eye 0.1.11 → 0.2

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --profile
+

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in eye.gemspec
-gemspec
+gemspec

data/README.md

@@ -1,7 +1,7 @@
 Eye
 ===
 
-Process monitoring tool. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
+Process monitoring tool. Alternative for God and Bluepill. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.
 
 
 Recommended installation on the server (system wide):
@@ -10,27 +10,30 @@ Recommended installation on the server (system wide):
     $ sudo ln -sf /usr/local/ruby/1.9.3/bin/eye /usr/local/bin/eye
 
 
-Config example, shows most of the options (examples/test.eye):
+Config example, shows some typical processes and most of the options (see in exampes/ folder):
 
+examples/test.eye
 ```ruby
 Eye.load("./eye/*.rb") # load submodules
+
 Eye.config do
   logger "/tmp/eye.log" # eye logger
+  logger_level Logger::DEBUG
 end
 
-Eye.app "test" do
+Eye.application "test" do
   working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
-  stdall "trash.log" # stdout + stderr
-  env "APP_ENV" => "production"
+  stdall "trash.log" # stdout,err logs for processes by default
+  env "APP_ENV" => "production" # global env for each processes
   triggers :flapping, :times => 10, :within => 1.minute
 
   group "samples" do
-    env "A" => "1" # env merging
+    env "A" => "1" # merging to app env 
     chain :grace => 5.seconds, :action => :restart # restarting with 5s interval, one by one.
 
     # eye daemonized process
     process("sample1") do
-      pid_file "1.pid" # expanded with working_dir
+      pid_file "1.pid" # will be expanded with working_dir
       start_command "ruby ./sample.rb"
       daemonize true
       stdall "sample1.log"
@@ -42,7 +45,7 @@ Eye.app "test" do
     process("sample2") do
       pid_file "2.pid"
       start_command "ruby ./sample.rb -d --pid 2.pid --log sample2.log"
-      stop_command "kill -9 {{PID}}"
+      stop_command "kill -9 {PID}"
 
       checks :memory, :below => 300.megabytes, :times => 3
     end
@@ -59,12 +62,30 @@ Eye.app "test" do
     stop_grace 5.seconds
   
     monitor_children do
-      childs_update_period 5.seconds
-
-      restart_command "kill -2 {{PID}}"
+      restart_command "kill -2 {PID}" # for this child process
       checks :memory, :below => 300.megabytes, :times => 3
     end
   end
+  
+  process :event_machine do |p|
+    p.pid_file        = 'em.pid'
+    p.start_command   = 'ruby em.rb'
+    p.stdout          = 'em.log'
+    p.daemonize       = true
+    p.stop_signals    = [:QUIT, 2.seconds, :KILL]
+    
+    p.checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2, 
+                      :timeout => 1.second, :send_data => "ping", :expect_data => /pong/
+  end
+
+  process :thin do
+    pid_file "thin.pid"
+    start_command "bundle exec thin start -R thin.ru -p 33233 -d -l thin.log -P thin.pid"
+    stop_signals [:QUIT, 2.seconds, :TERM, 1.seconds, :KILL]
+
+    checks :http, :url => "http://127.0.0.1:33233/hello", :pattern => /World/, :every => 5.seconds, 
+                  :times => [2, 3], :timeout => 1.second
+  end
 
 end
 ```
@@ -87,14 +108,16 @@ Process statuses:
     $ eye i(nfo)
 
 ```
-test                               
+test                       
   samples                          
-    sample1 ....................... up  (21:38, 0%, 15Mb, <4813>)
-    sample2 ....................... up  (21:36, 0%, 14Mb, <4530>)
-  forking ......................... up  (21:34, 0%, 19Mb, <4272>)
-    =child= ....................... up  (21:34, 0%, 22Mb, <4275>)
-    =child= ....................... up  (21:34, 0%, 21Mb, <4278>)
-    =child= ....................... up  (21:34, 0%, 21Mb, <4281>)
+    sample1 ....................... up  (21:52, 0%, 13Mb, <4107>)
+    sample2 ....................... up  (21:52, 0%, 12Mb, <4142>)
+  event_machine ................... up  (21:52, 3%, 26Mb, <4112>)
+  forking ......................... up  (21:52, 0%, 41Mb, <4203>)
+    child-4206 .................... up  (21:52, 0%, 41Mb, <4206>)
+    child-4211 .................... up  (21:52, 0%, 41Mb, <4211>)
+    child-4214 .................... up  (21:52, 0%, 41Mb, <4214>)
+  thin ............................ up  (21:53, 2%, 54Mb, <4228>)
 ```
 
 ### Commands:

data/bin/eye

@@ -23,8 +23,9 @@ class Cli < Thor
 
   desc "xinfo", "extended eye info, debug data"
   method_option :config, :type => :boolean, :aliases => "-c"
+  method_option :show_processes, :type => :boolean, :aliases => "-p"
   def xinfo    
-    res = cmd(:xinfo, options[:config])
+    res = cmd(:xinfo, options[:config], options[:show_processes])
     puts res if res && !res.empty?
     puts
   end
@@ -167,8 +168,8 @@ private
       end
 
       if opts[:print_config]
-        require 'yaml'
-        puts YAML.dump(res[:config])
+        require 'pp'
+        PP.pp res[:config]
       end
     end
   end

data/examples/processes/em.rb

@@ -44,7 +44,8 @@ class EchoObj < EM::Connection
   end  
 end
 
-trap "TERM" do
+trap "QUIT" do
+  puts "quit signal, stopping"
   EM.stop
 end
 

data/examples/processes/thin.ru

@@ -0,0 +1,12 @@
+require 'bundler/setup'
+require 'sinatra'
+
+class Test < Sinatra::Base
+
+  get '/hello' do
+    sleep 0.5
+    "Hello World!"
+  end
+end
+
+run Test.new

data/examples/sidekiq.eye

@@ -0,0 +1,19 @@
+def sidekiq_process(proxy, name)
+  proxy.process(name) do
+    start_command "ruby ./bin/sidekiq -e #{proxy.env['RAILS_ENV']} -C ./config/sidekiq.#{proxy.env['RAILS_ENV']}.yml"
+    pid_file "tmp/pids/#{name}.pid"
+    stdall "log/#{name}.log"
+    daemonize true
+    stop_signals [:QUIT, 5.seconds, :TERM, 5.seconds, :KILL]
+    
+    checks :cpu, :every => 30, :below => 100, :times => 5
+    checks :memory, :every => 30, :below => 300.megabytes, :times => 5
+  end
+end
+
+Eye.application :sidekiq_test do
+  working_dir '/some_dir'
+  env "RAILS_ENV" => 'production'
+ 
+  sidekiq_process self, :sidekiq
+end

data/examples/test.eye

@@ -1,22 +1,23 @@
 Eye.load("./eye/*.rb") # load submodules
+
 Eye.config do
   logger "/tmp/eye.log" # eye logger
   logger_level Logger::DEBUG
 end
 
-Eye.app "test" do
+Eye.application "test" do
   working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
-  stdall "trash.log" # stdout + stderr
-  env "APP_ENV" => "production"
+  stdall "trash.log" # stdout,err logs for processes by default
+  env "APP_ENV" => "production" # global env for each processes
   triggers :flapping, :times => 10, :within => 1.minute
 
   group "samples" do
-    env "A" => "1" # env merging
+    env "A" => "1" # merging to app env 
     chain :grace => 5.seconds, :action => :restart # restarting with 5s interval, one by one.
 
     # eye daemonized process
     process("sample1") do
-      pid_file "1.pid" # expanded with working_dir
+      pid_file "1.pid" # will be expanded with working_dir
       start_command "ruby ./sample.rb"
       daemonize true
       stdall "sample1.log"
@@ -28,7 +29,7 @@ Eye.app "test" do
     process("sample2") do
       pid_file "2.pid"
       start_command "ruby ./sample.rb -d --pid 2.pid --log sample2.log"
-      stop_command "kill -9 {{PID}}"
+      stop_command "kill -9 {PID}"
 
       checks :memory, :below => 300.megabytes, :times => 3
     end
@@ -45,21 +46,29 @@ Eye.app "test" do
     stop_grace 5.seconds
   
     monitor_children do
-      childs_update_period 5.seconds
-
-      restart_command "kill -2 {{PID}}"
+      restart_command "kill -2 {PID}" # for this child process
       checks :memory, :below => 300.megabytes, :times => 3
     end
   end
   
-  process :event_machine do
-    pid_file 'em.pid'
-    start_command 'ruby em.rb'
-    stdall 'em.log'
-    daemonize true
+  process :event_machine do |p|
+    p.pid_file        = 'em.pid'
+    p.start_command   = 'ruby em.rb'
+    p.stdout          = 'em.log'
+    p.daemonize       = true
+    p.stop_signals    = [:QUIT, 2.seconds, :KILL]
     
-    checks :socket, :addr => "tcp://127.0.0.1:33221", :send_data => "ping", :expect_data => /pong/,
-                    :every => 10.seconds, :times => 2, :timeout => 1.second
+    p.checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2, 
+                      :timeout => 1.second, :send_data => "ping", :expect_data => /pong/
+  end
+
+  process :thin do
+    pid_file "thin.pid"
+    start_command "bundle exec thin start -R thin.ru -p 33233 -d -l thin.log -P thin.pid"
+    stop_signals [:QUIT, 2.seconds, :TERM, 1.seconds, :KILL]
+
+    checks :http, :url => "http://127.0.0.1:33233/hello", :pattern => /World/, :every => 5.seconds, 
+                  :times => [2, 3], :timeout => 1.second
   end
 
 end

data/eye.gemspec

@@ -1,12 +1,11 @@
-# -*- encoding: utf-8 -*-
 require File.expand_path('../lib/eye', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = "Konstantin Makarchev"
   gem.email         = "kostya27@gmail.com"
 
-  gem.description   = %q{Process monitoring tool. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.}
-  gem.summary       = %q{Process monitoring tool. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.}
+  gem.description   = gem.summary = \
+    %q{Process monitoring tool. Alternative for God and Bluepill. With Bluepill like config syntax. Requires MRI Ruby >= 1.9.2. Uses Celluloid and Celluloid::IO.}
   gem.homepage      = "http://github.com/kostya/eye"
 
   gem.files         = `git ls-files`.split($\)
@@ -34,4 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'forking'
   gem.add_development_dependency 'fakeweb'
   gem.add_development_dependency 'eventmachine'
+  gem.add_development_dependency 'sinatra'
+  gem.add_development_dependency 'thin'
+  gem.add_development_dependency 'xmpp4r'
 end

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye  
-  VERSION   = "0.1.11"
+  VERSION   = "0.2"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2013 @kostya"
 
   autoload :Process,        'eye/process'
@@ -16,6 +16,7 @@ module Eye
   autoload :Settings,       'eye/settings'
   autoload :Client,         'eye/client'
   autoload :Utils,          'eye/utils'
+  autoload :Notify,         'eye/notify'
   
   autoload :Controller,     'eye/controller'
   autoload :Control,        'eye/control'

data/lib/eye/checker/validation.rb

@@ -42,7 +42,7 @@ module Eye::Checker::Validation
     end
 
     should_bes.each do |param|
-      raise Error, "#{self.name} bad param :#{param}, value should be" unless options[param.to_sym] || defaults[param.to_sym]
+      raise Error, "#{self.name} for param :#{param} value should be" unless options[param.to_sym] || defaults[param.to_sym]
     end
   end
 

data/lib/eye/child_process.rb

@@ -27,16 +27,17 @@ class Eye::ChildProcess
   # scheduler
   include Eye::Process::Scheduler
 
-  attr_reader :pid, :name, :config, :watchers
+  attr_reader :pid, :name, :full_name, :config, :watchers
 
   def initialize(pid, config = {}, logger_prefix = nil)
     raise 'Empty pid' unless pid
 
     @pid = pid
     @config = prepare_config(config)
-    @name = '=child='
+    @name = "child-#{pid}"
+    @full_name = [logger_prefix, @name] * ':'
 
-    @logger = Eye::Logger.new("#{logger_prefix} child:#{pid}")
+    @logger = Eye::Logger.new(@full_name)
     
     @watchers = {}
 
@@ -49,12 +50,23 @@ class Eye::ChildProcess
     :up
   end
 
+  def send_command(command, *args)
+    schedule command, *args, "#{command} by user"
+  end
+
+  def start
+  end
+
   def stop
     kill_process
   end
 
   def restart
-    stop
+    if self[:restart_command]
+      execute_restart_command
+    else
+      stop
+    end    
   end
 
   def monitor
@@ -63,11 +75,21 @@ class Eye::ChildProcess
   def unmonitor
   end
 
-  def delete
+  def delete 
+  end
+
+  def destroy
     remove_watchers
     terminate
   end
 
+  def signal(sig)
+    if self.pid
+      res = send_signal(sig)
+      info "send signal #{sig} to #{self.pid} = #{res}"
+    end
+  end
+
   def status_data(debug = false)
     self_status_data(debug)
   end

data/lib/eye/controller/load.rb

@@ -24,7 +24,7 @@ module Eye::Controller::Load
 private
 
   # regexp for clean backtrace to show for user
-  BT_REGX = %r[/lib/eye/|lib/celluloid|internal:prelude|logger.rb:].freeze
+  BT_REGX = %r[/lib/eye/|lib/celluloid|internal:prelude|logger.rb:|active_support/core_ext|shellwords.rb].freeze
 
   def catch_load_error(filename, &block)
     res = block.call
@@ -34,7 +34,8 @@ private
     error "load: config error <#{filename}>: #{ex.message}"
 
     # filter backtrace for user output
-    bt = (ex.backtrace || []).reject{|line| line.to_s =~ BT_REGX }
+    bt = (ex.backtrace || [])
+    bt = bt.reject{|line| line.to_s =~ BT_REGX }
     error bt.join("\n")
 
     res = {:error => true, :message => ex.message}
@@ -69,27 +70,28 @@ private
 
     raise Eye::Dsl::Error, "config file '#{mask}' not found!" if configs.blank?
 
-    new_cfg = @current_config
+    @loaded_config = Eye::Dsl.initial_config
     configs.each do |cfg| 
-      new_cfg = merge_configs(new_cfg, cfg)
+      @loaded_config = merge_configs(@loaded_config, cfg)
     end
 
+    new_cfg = merge_configs(@current_config, @loaded_config)
     validate(new_cfg)
-
     new_cfg
   end
 
   def _load(filename)
     new_cfg = parse_set_of_configs(filename)
-
-    load_config(new_cfg)
+    
+    load_config(new_cfg, @loaded_config[:applications].keys)
+    @loaded_config = nil
 
     GC.start
   end
 
-  def load_config(new_config)
+  def load_config(new_config, changed_apps = [])
     load_options(new_config[:config])
-    create_objects(new_config[:applications])
+    create_objects(new_config[:applications], changed_apps)
     @current_config = new_config
   end
 
@@ -117,10 +119,10 @@ private
   end
 
   # create objects as diff, from configs
-  def create_objects(apps_config)
+  def create_objects(apps_config, changed_apps = [])
     debug 'create objects'
     apps_config.each do |app_name, app_cfg|
-      update_or_create_application(app_name, app_cfg.clone)
+      update_or_create_application(app_name, app_cfg.clone) if changed_apps.include?(app_name)
     end
 
     # sorting applications