eye 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 8695cf6cc62b0a083c7470bc0b3f338ce5e678f2
-  data.tar.gz: f0ed23ed079228bcb897149b265e8a7f2faa5774
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Yzg5NjVhMzljODliZWQ5OTZiOWM4NzYyMTc2YTgzYWVlOWY5MTRhYw==
+  data.tar.gz: !binary |-
+    MzQzY2FjY2Y3ZDllYTdjZjE0OGZhY2FhZDdkYTA2ZmE0Y2FjNzIyMg==
 SHA512:
-  metadata.gz: 36c299addb4c2dcf551930f02770f91842b9b896e86bafbaf485833b9fc489ceb4bdaecb1d35438e830afc6ff81d353ada49d6677a10ca0d6cb0a29f7b5957ea
-  data.tar.gz: 193455755372b1e5bed00a954c16ec79af9b531bc2c0574f58b7f75ff90951ccaedb62771bc9eae167883a617e481f18feb3a6d91c990681117d982f49b3e770
+  metadata.gz: !binary |-
+    ZDMzMzRhZWY3YTk1ZjA5NWVhZjljZjlhOTcwODVjNjYwM2Q1NDY3ZThjN2Vj
+    ZDA2NWI4MDg3YmExNmRmZDMwNWQ0ZDY5MmNjYzAzMTViMmE3MjlkOTBmOTAw
+    NWJhMjUwZjE3YzI0MTA1MDM3YTZiN2RiZDA3OGJlOTY4MjIyYTM=
+  data.tar.gz: !binary |-
+    NDdhNTkxM2NlMzE4NzI3ZjlmNzUxODFiYzBkZDA3OTM2Mzc2ZGRiNTU2OGQ1
+    ZGE1YzE2OTU3NDNkZDFiODQ3YjE3YTc4OWM5YzU4M2NiMmVhNmYwMWExZTQ0
+    ZjFjMGU5YjBiNzRjZjZiMjM4ODYwNGEwNGYyMjAzNjI2Y2RlOTI=

data/CHANGES.md

@@ -1,3 +1,11 @@
+0.6.3
+-----
+* Add custom logger #81
+* Revert check by procline, this was hack, fix for #62 should be in 0.7
+* Fix ruby path, and expand_paths #69, #75
+* Add json info `eye info -j`
+* Rename local runner to `leye`
+
 0.6.2
 -----
 * Add user defined command #65

data/README.md

@@ -24,7 +24,7 @@ We wanted something more robust and production stable.
 
 We wanted the features of bluepill and god, with a few extras like chains, nested configuring, mask matching, easy debug configs
 
-I hope we've success, we're using eye in production and are quite happy.
+I hope we've succeeded, we're using eye in production and are quite happy.
 
 ###  Config example
 
@@ -205,8 +205,10 @@ 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:
+[EyeHttp Gem](https://github.com/kostya/eye-http)
 
-    https://github.com/kostya/eye-http
+[Eye related projects](https://github.com/kostya/eye/wiki/Related-projects)
+
+[Articles](https://github.com/kostya/eye/wiki/Articles)
 
 Thanks `Bluepill` for the nice config ideas.

data/examples/delayed_job.eye

@@ -0,0 +1,28 @@
+cwd = File.expand_path(File.join(File.dirname(__FILE__), %w[ ../ ../ ]))
+
+config_path = File.join(cwd, %w{ config dj.yml } )
+
+workers_count = if File.exists?(config_path)
+  YAML.load_file(config_path).try(:[], :workers) || 5
+else
+  5
+end
+
+Eye.application 'delayed_job' do
+  working_dir cwd
+  stop_on_delete true
+
+  group 'dj' do
+    chain grace: 5.seconds
+
+    (1 .. workers_count).each do |i|
+      process "dj-#{i}" do
+        pid_file "tmp/pids/delayed_job.#{i}.pid"
+        start_command "rake jobs:work"
+        daemonize true
+        stop_signals [:INT, 30.seconds, :TERM, 10.seconds, :KILL]
+        stdall "log/dj-#{i}.log"
+      end
+    end
+  end
+end

data/examples/sidekiq.eye

@@ -4,11 +4,11 @@ def sidekiq_process(proxy, name)
   rails_env = proxy.env['RAILS_ENV']
 
   proxy.process(name) do
-    start_command "ruby ./bin/sidekiq -e #{rails_env} -C ./config/sidekiq.#{rails_env}.yml"
+    start_command "bin/sidekiq -e #{rails_env} -C ./config/sidekiq.#{rails_env}.yml"
     pid_file "tmp/pids/#{name}.pid"
     stdall "log/#{name}.log"
     daemonize true
-    stop_signals [:QUIT, 5.seconds, :TERM, 5.seconds, :KILL]
+    stop_signals [:USR1, 0, :TERM, 10.seconds, :KILL]
 
     check :cpu, :every => 30, :below => 100, :times => 5
     check :memory, :every => 30, :below => 300.megabytes, :times => 5

data/examples/stress_test.eye

@@ -0,0 +1,18 @@
+# this is not example, just config for eye stress test
+
+PREFIX = ENV['PRE'] || 1
+
+Eye.app :stress_test do
+  working_dir "/tmp"
+
+  100.times do |i|
+    process "sleep-#{i}" do
+      pid_file "sleep-#{PREFIX}-#{i}.pid"
+      start_command "sleep 120"
+      daemonize true
+
+      checks :cpu, :every => 5.seconds, :below => 10, :times => 5
+      checks :memory, :every => 6.seconds, :below => 50.megabytes, :times => 5
+    end
+  end
+end

data/lib/eye.rb

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

data/lib/eye/application.rb

@@ -6,7 +6,7 @@ class Eye::Application
     @groups = Eye::Utils::AliveArray.new
     @name = name
     @config = config
-    debug 'created'
+    debug { 'created' }
   end
 
   def logger_tag

data/lib/eye/checker.rb

@@ -66,7 +66,7 @@ class Eye::Checker
     @full_name = @process.full_name if @process
     @initialized_at = Time.now
 
-    debug "create checker, with #{options}"
+    debug { "create checker, with #{options}" }
 
     @value = nil
     @values = Eye::Utils::Tail.new(max_tries)
@@ -96,7 +96,7 @@ class Eye::Checker
 
   def check
     if initial_grace && (Time.now - @initialized_at < initial_grace)
-      debug 'skipped initial grace'
+      debug { 'skipped initial grace' }
       return true
     else
       @options[:initial_grace] = nil

data/lib/eye/checker/http.rb

@@ -33,7 +33,7 @@ class Eye::Checker::Http < Eye::Checker::Defer
     {:result => res}
 
   rescue Timeout::Error => ex
-    debug ex.inspect
+    debug { ex.inspect }
 
     if defined?(Net::OpenTimeout) # for ruby 2.0
       mes = ex.class.is_a?(Net::OpenTimeout) ? "OpenTimeout<#{@open_timeout}>" : "ReadTimeout<#{@read_timeout}>"

data/lib/eye/child_process.rb

@@ -37,7 +37,7 @@ class Eye::ChildProcess
 
     @watchers = {}
 
-    debug "start monitoring CHILD config: #{@config.inspect}"
+    debug { "start monitoring CHILD config: #{@config.inspect}" }
 
     start_checkers
   end

data/lib/eye/cli.rb

@@ -13,13 +13,20 @@ class Eye::Cli < Thor
   include Eye::Cli::Render
 
   desc "info [MASK]", "processes info"
+  method_option :json, :type => :boolean, :aliases => "-j"
   def info(mask = nil)
     res = cmd(:info_data, *Array(mask))
     if mask && res[:subtree] && res[:subtree].empty?
       error!("command :info, objects not found!")
     end
-    say render_info(res)
-    say
+
+    if options[:json]
+      require 'json'
+      say JSON.dump(res)
+    else
+      say render_info(res)
+      say
+    end
   end
 
   desc "status NAME", "return exit status for process name 0-up, 3-unmonitored"

data/lib/eye/cli/server.rb

@@ -13,8 +13,7 @@ private
   end
 
   def ruby_path
-    require 'rbconfig'
-    RbConfig::CONFIG['bindir'] + '/ruby'
+    RbConfig.ruby
   end
 
   def ensure_loader_path

data/lib/eye/controller/commands.rb

@@ -37,7 +37,7 @@ module Eye::Controller::Commands
       when :ping
         :pong
       when :logger_dev
-        Eye::Logger.dev
+        Eye::Logger.dev.to_s
 
       # object commands, for api
       when :info_data

data/lib/eye/controller/load.rb

@@ -64,7 +64,7 @@ private
         filename
       end
 
-      debug "loading: globbing mask #{mask}"
+      debug { "loading: globbing mask #{mask}" }
 
       sub = []
       Dir[mask].each do |config_path|
@@ -80,7 +80,7 @@ private
 
   # return: result, config
   def parse_config(filename)
-    debug "parsing: #{filename}"
+    debug { "parsing: #{filename}" }
 
     cfg = Eye::Dsl.parse(nil, filename)
     @current_config.merge(cfg).validate!(false) # just validate summary config here
@@ -111,7 +111,7 @@ private
 
   # create objects as diff, from configs
   def create_objects(apps_config, changed_apps = [])
-    debug 'creating objects'
+    debug { 'creating objects' }
 
     apps_config.each do |app_name, app_cfg|
       update_or_create_application(app_name, app_cfg.clone) if changed_apps.include?(app_name)
@@ -137,9 +137,9 @@ private
 
       @applications.delete(app)
 
-      debug "updating app: #{app_name}"
+      debug { "updating app: #{app_name}" }
     else
-      debug "creating app: #{app_name}"
+      debug { "creating app: #{app_name}" }
     end
 
     app = Eye::Application.new(app_name, app_config)
@@ -182,13 +182,13 @@ private
 
   def update_or_create_group(group_name, group_config)
     group = if @old_groups[group_name]
-      debug "updating group: #{group_name}"
+      debug { "updating group: #{group_name}" }
       group = @old_groups.delete(group_name)
       group.schedule :update_config, group_config, Eye::Reason::User.new(:'load config')
       group.clear
       group
     else
-      debug "creating group: #{group_name}"
+      debug { "creating group: #{group_name}" }
       gr = Eye::Group.new(group_name, group_config)
       @added_groups << gr
       gr
@@ -209,12 +209,12 @@ private
     key = @old_processes[name] ? name : @old_processes.keys.detect { |n| n.end_with?(postfix) }
 
     if @old_processes[key]
-      debug "updating process: #{name}"
+      debug { "updating process: #{name}" }
       process = @old_processes.delete(key)
       process.schedule :update_config, process_cfg, Eye::Reason::User.new(:'load config')
       process
     else
-      debug "creating process: #{name}"
+      debug { "creating process: #{name}" }
       process = Eye::Process.new(process_cfg)
       @added_processes << process
       process

data/lib/eye/controller/options.rb

@@ -15,4 +15,4 @@ module Eye::Controller::Options
     warn "Warning, set http options not in reel-eye gem" if opts.present?
   end
 
-end
+end

data/lib/eye/controller/status.rb

@@ -8,8 +8,8 @@ module Eye::Controller::Status
       :about => Eye::ABOUT,
       :resources => Eye::SystemResources.resources($$),
       :ruby => RUBY_DESCRIPTION,
-      :gems => %w|Celluloid Celluloid::IO StateMachine NIO Sigar|.map{|c| gem_version(c) },
-      :logger => Eye::Logger.args.present? ? [Eye::Logger.dev, *Eye::Logger.args] : Eye::Logger.dev,
+      :gems => %w|Celluloid Celluloid::IO StateMachine NIO Timers Sigar|.map{|c| gem_version(c) },
+      :logger => Eye::Logger.args.present? ? [Eye::Logger.dev.to_s, *Eye::Logger.args] : Eye::Logger.dev.to_s,
       :pid_path => Eye::Local::pid_path,
       :sock_path => Eye::Local::socket_path,
       :actors => actors

data/lib/eye/dsl/application_opts.rb

@@ -12,7 +12,7 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
 
   def group(name, &block)
     Eye::Dsl.check_name(name)
-    Eye::Dsl.debug "=> group #{name}"
+    Eye::Dsl.debug { "=> group #{name}" }
 
     opts = Eye::Dsl::GroupOpts.new(name, self)
     opts.instance_eval(&block)
@@ -24,7 +24,7 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
       Eye::Utils.deep_merge!(@config[:groups][name.to_s], cfg)
     end
 
-    Eye::Dsl.debug "<= group #{name}"
+    Eye::Dsl.debug { "<= group #{name}" }
     opts
   end
 

data/lib/eye/dsl/config_opts.rb

@@ -7,8 +7,6 @@ class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
     if args.empty?
       @config[:logger]
     else
-      str = args[0]
-      raise Eye::Dsl::Error, "logger should be a String #{str.inspect}" if !(str.is_a?(String) || str == nil)
       @config[:logger] = args
     end
   end

data/lib/eye/dsl/group_opts.rb

@@ -13,7 +13,7 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
   def process(name, &block)
     Eye::Dsl.check_name(name)
 
-    Eye::Dsl.debug "=> process #{name}"
+    Eye::Dsl.debug { "=> process #{name}" }
 
     opts = Eye::Dsl::ProcessOpts.new(name, self)
     opts.instance_eval(&block)
@@ -21,7 +21,7 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
     @config[:processes][name.to_s] ||= {}
     Eye::Utils.deep_merge!(@config[:processes][name.to_s], opts.config) if opts.config
 
-    Eye::Dsl.debug "<= process #{name}"
+    Eye::Dsl.debug { "<= process #{name}" }
     opts
   end
 

data/lib/eye/dsl/main.rb

@@ -5,7 +5,7 @@ module Eye::Dsl::Main
     Eye::Dsl.check_name(name)
     name = name.to_s
 
-    Eye::Dsl.debug "=> app: #{name}"
+    Eye::Dsl.debug { "=> app: #{name}" }
 
     if name == '__default__'
       @parsed_default_app ||= Eye::Dsl::ApplicationOpts.new(name)
@@ -16,7 +16,7 @@ module Eye::Dsl::Main
       @parsed_config.applications[name] = opts.config if opts.config
     end
 
-    Eye::Dsl.debug "<= app: #{name}"
+    Eye::Dsl.debug { "<= app: #{name}" }
   end
 
   alias project application
@@ -29,11 +29,11 @@ module Eye::Dsl::Main
     Eye::Dsl::Opts.with_parsed_file(glob) do |mask|
       Dir[mask].each do |path|
         loaded = true
-        Eye::Dsl.debug "=> load #{path}"
+        Eye::Dsl.debug { "=> load #{path}" }
         Eye.parsed_filename = path
         res = Kernel.load(path)
         Eye.info "load: subload #{path} (#{res})"
-        Eye::Dsl.debug "<= load #{path}"
+        Eye::Dsl.debug { "<= load #{path}" }
       end
     end
 
@@ -44,13 +44,13 @@ module Eye::Dsl::Main
   end
 
   def config(&block)
-    Eye::Dsl.debug '=> config'
+    Eye::Dsl.debug { '=> config' }
 
     opts = Eye::Dsl::ConfigOpts.new
     opts.instance_eval(&block)
     Eye::Utils.deep_merge!(@parsed_config.settings, opts.config)
 
-    Eye::Dsl.debug '<= config'
+    Eye::Dsl.debug { '<= config' }
   end
 
   alias settings config

data/lib/eye/dsl/opts.rb

@@ -13,7 +13,6 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   create_options_methods(INTERVAL_OPTIONS, [Fixnum, Float])
 
   create_options_methods([:environment], Hash)
-  create_options_methods([:stop_signals], Array)
   create_options_methods([:umask], Fixnum)
 
 
@@ -95,9 +94,18 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:notify].delete(contact.to_s)
   end
 
-  def set_stop_signals(value)
-    super
-    validate_signals(value)
+  def stop_signals(*args)
+    if args.count == 0
+      return @config[:stop_signals]
+    end
+
+    signals = Array(args).flatten
+    validate_signals(signals)
+    @config[:stop_signals] = signals
+  end
+
+  def stop_signals=(s)
+    stop_signals(s)
   end
 
   def set_environment(value)

data/lib/eye/dsl/pure_opts.rb

@@ -83,9 +83,9 @@ class Eye::Dsl::PureOpts
     if proc.is_a?(String)
       self.class.with_parsed_file(proc) do |path|
         if File.exists?(path)
-          Eye::Dsl.debug "=> load #{path}"
+          Eye::Dsl.debug { "=> load #{path}" }
           self.instance_eval(File.read(path))
-          Eye::Dsl.debug "<= load #{path}"
+          Eye::Dsl.debug { "<= load #{path}" }
         end
       end
     else
@@ -106,11 +106,10 @@ private
   def self.with_parsed_file(file_name)
     saved_parsed_filename = Eye.parsed_filename
 
-    require 'pathname'
 
     real_filename = Eye.parsed_filename && File.symlink?(Eye.parsed_filename) ? File.readlink(Eye.parsed_filename) : Eye.parsed_filename
     dirname = File.dirname(real_filename) rescue nil
-    path = Pathname.new(file_name).expand_path(dirname).to_s
+    path = File.expand_path(file_name, dirname)
 
     Eye.parsed_filename = path
     yield path
@@ -118,4 +117,4 @@ private
     Eye.parsed_filename = saved_parsed_filename
   end
 
-end
+end

data/lib/eye/group.rb

@@ -15,7 +15,7 @@ class Eye::Group
     @config = config
     @processes = Eye::Utils::AliveArray.new
     @hidden = (name == '__default__')
-    debug 'created'
+    debug { 'created' }
   end
 
   def logger_tag

data/lib/eye/group/chain.rb

@@ -26,14 +26,14 @@ private
       break if @chain_breaker
     end
 
-    debug "chain finished #{Time.now - started_at}s"
+    debug { "chain finished #{Time.now - started_at}s" }
 
     @chain_processes_count = nil
     @chain_processes_current = nil
   end
 
   def chain_schedule_process(process, type, command, *args)
-    debug "chain_schedule_process #{process.name} #{type} #{command}"
+    debug { "chain_schedule_process #{process.name} #{type} #{command}" }
 
     if type == :sync
       # sync command, with waiting

data/lib/eye/local.rb

@@ -5,7 +5,7 @@ module Eye::Local
     def dir
       @dir ||= begin
         if root?
-        '/var/run/eye'
+          '/var/run/eye'
         else
           File.expand_path(File.join(home, '.eye'))
         end
@@ -35,11 +35,11 @@ module Eye::Local
     end
 
     def path(path)
-      File.join(dir, path)
+      File.expand_path(path, dir)
     end
 
     def ensure_eye_dir
-      FileUtils.mkdir_p( dir )
+      FileUtils.mkdir_p(dir)
     end
 
     def socket_path

data/lib/eye/logger.rb

@@ -10,7 +10,7 @@ class Eye::Logger
       super
 
       self.formatter = Proc.new do |s, d, p, m|
-        "#{d.strftime(FORMAT)} $#{$$} #{s.ljust(5)} -- #{m}\n"
+        "#{d.strftime(FORMAT)} #{s.ljust(5)} -- #{m}\n"
       end
     end
   end
@@ -29,8 +29,8 @@ class Eye::Logger
 
     Logger::Severity.constants.each do |level|
       method_name = level.to_s.downcase
-      define_method method_name do |msg|
-        logger.send(method_name, msg)
+      define_method method_name do |msg = nil, &block|
+        logger.send(method_name, msg, &block)
       end
     end
 
@@ -42,8 +42,12 @@ class Eye::Logger
 
   Logger::Severity.constants.each do |level|
     method_name = level.to_s.downcase
-    define_method method_name do |msg|
-      self.class.inner_logger.send(method_name, "#{prefix_str}#{msg}")
+    define_method method_name do |msg = nil, &block|
+      if block
+        self.class.inner_logger.send(method_name) { "#{prefix_str}#{block.call}" }
+      else
+        self.class.inner_logger.send(method_name, "#{prefix_str}#{msg}")
+      end
     end
   end
 
@@ -57,17 +61,23 @@ class Eye::Logger
 
     def link_logger(dev, *args)
       old_dev = @dev
-      @dev = dev ? dev.to_s : nil
-      @dev_fd = @dev
+      @dev = @dev_fd = dev
       @args = args
 
-      @dev_fd = STDOUT if @dev.to_s.downcase == 'stdout'
-      @dev_fd = STDERR if @dev.to_s.downcase == 'stderr'
+      if dev.nil?
+        @inner_logger = InnerLogger.new(nil)
+      elsif dev.is_a?(String)
+        @dev_fd = STDOUT if @dev.to_s.downcase == 'stdout'
+        @dev_fd = STDERR if @dev.to_s.downcase == 'stderr'
+        @inner_logger = InnerLogger.new(@dev_fd, *args)
+      else
+        @inner_logger = dev
+      end
 
-      @inner_logger = InnerLogger.new(@dev_fd, *args)
       @inner_logger.level = self.log_level || Logger::INFO
 
-    rescue Errno::ENOENT, Errno::EACCES
+    rescue Exception
+      @inner_logger = nil
       @dev = old_dev
       raise
     end

data/lib/eye/notify.rb

@@ -56,7 +56,7 @@ class Eye::Notify
     @message_h = message_h
     @options = options
 
-    debug "created notifier #{options}"
+    debug { "created notifier #{options}" }
   end
 
   def logger_sub_tag
@@ -69,9 +69,9 @@ class Eye::Notify
   end
 
   def notify
-    debug "start notify #{@message_h}"
+    debug { "start notify #{@message_h}" }
     execute
-    debug "end notify #{@message_h}"
+    debug { "end notify #{@message_h}" }
     terminate
   end
 

data/lib/eye/notify/jabber.rb

@@ -13,7 +13,7 @@ class Eye::Notify::Jabber < Eye::Notify
   param :password, String
 
   def execute
-    debug "send jabber #{[host, port, user, password]} - #{[contact, message_body]}"
+    debug { "send jabber #{[host, port, user, password]} - #{[contact, message_body]}" }
 
     mes = ::Jabber::Message.new(contact, message_body)
     mes.set_type(:normal)

data/lib/eye/notify/mail.rb

@@ -26,7 +26,7 @@ class Eye::Notify::Mail < Eye::Notify
 
   def smtp
     args = [host, port, domain, user, password, auth]
-    debug "called smtp with #{args}"
+    debug { "called smtp with #{args}" }
     smtp = Net::SMTP.new host, port
     smtp.enable_starttls if starttls
 

data/lib/eye/process.rb

@@ -36,7 +36,7 @@ class Eye::Process
     @states_history = Eye::Process::StatesHistory.new(100)
     @states_history << :unmonitored
 
-    debug "creating with config: #{@config.inspect}"
+    debug { "creating with config: #{@config.inspect}" }
 
     add_triggers
 

data/lib/eye/process/children.rb

@@ -40,7 +40,7 @@ module Eye::Process::Children
     end
 
     h = {:new => new_children.size, :removed => removed_children.size, :exists => exist_children.size }
-    debug "children info: #{ h.inspect }"
+    debug { "children info: #{ h.inspect }" }
 
     @updating_children = false
     h

data/lib/eye/process/commands.rb

@@ -1,7 +1,7 @@
 module Eye::Process::Commands
 
   def start_process
-    debug 'start_process command'
+    debug { 'start_process command' }
 
     switch :starting
 
@@ -14,7 +14,7 @@ module Eye::Process::Commands
     result = self[:daemonize] ? daemonize_process : execute_process
 
     if !result[:error]
-      debug "process <#{self.pid}> started successfully"
+      debug { "process <#{self.pid}> started successfully" }
       switch :started
     else
       error "process <#{self.pid}> failed to start (#{result[:error].inspect})"
@@ -38,7 +38,7 @@ module Eye::Process::Commands
   end
 
   def stop_process
-    debug 'stop_process command'
+    debug { 'stop_process command' }
 
     switch :stopping
 
@@ -64,7 +64,7 @@ module Eye::Process::Commands
   end
 
   def restart_process
-    debug 'restart_process command'
+    debug { 'restart_process command' }
 
     switch :restarting
 
@@ -131,7 +131,7 @@ private
       sleep_grace(:stop_grace)
 
     else # default command
-      debug "executing: `kill -TERM #{self.pid}` with stop_grace: #{self[:stop_grace].to_f}s"
+      debug { "executing: `kill -TERM #{self.pid}` with stop_grace: #{self[:stop_grace].to_f}s" }
       send_signal(:TERM)
 
       sleep_grace(:stop_grace)
@@ -292,7 +292,10 @@ private
       while signals.present?
         delay = signals.shift
         signal = signals.shift
-        sleep (delay.to_f)
+        if wait_for_condition(delay.to_f, 0.3){ !process_really_running? }
+          info 'has terminated'
+          break
+        end
         send_signal(signal) if signal
       end
     else

data/lib/eye/process/config.rb

@@ -58,7 +58,7 @@ module Eye::Process::Config
     @full_name = nil
     @logger = nil
 
-    debug "updating config to: #{@config.inspect}"
+    debug { "updating config to: #{@config.inspect}" }
 
     remove_triggers
     add_triggers

data/lib/eye/process/monitor.rb

@@ -26,7 +26,7 @@ private
         return false
       end
     else
-      debug 'process was not found'
+      debug { 'process was not found' }
       return false
     end
   end
@@ -97,7 +97,7 @@ private
         schedule :unmonitor, Eye::Reason.new(:crashed)
       end
     else
-      debug 'check crashed: skipped, process is not in down'
+      debug { 'check crashed: skipped, process is not in down' }
     end
   end
 

data/lib/eye/process/scheduler.rb

@@ -27,9 +27,9 @@ module Eye::Process::Scheduler
   end
 
   def schedule_in(interval, command, *args, &block)
-    debug "schedule_in #{interval} :#{command} #{args}"
+    debug { "schedule_in #{interval} :#{command} #{args}" }
     after(interval.to_f) do
-      debug "scheduled_in #{interval} :#{command} #{args}"
+      debug { "scheduled_in #{interval} :#{command} #{args}" }
       schedule(command, *args, &block)
     end
   end

data/lib/eye/process/system.rb

@@ -8,17 +8,6 @@ module Eye::Process::System
       _pid > 0 ? _pid : nil
     end
 
-    # check pid from pid_file, in case when server reboot, or something
-    #   sometimes pid can be one of the eye-self(lwp) pid, we dont want
-    #   eye to die
-    if res && res != self.pid
-      cmd = Eye::Sigar.proc_args(res)[0].to_s rescue ''
-      if res == $$ || cmd.start_with?(Eye::PROCLINE)
-        error "Wtf? O_o load eye-self(lwp) pid_file #{res} #{$$} '#{cmd}'"
-        return
-      end
-    end
-
     res
   end
 
@@ -55,14 +44,14 @@ module Eye::Process::System
 
   def process_pid_running?(pid)
     res = Eye::System.check_pid_alive(pid)
-    debug "process_really_running?: (#{pid}) #{res.inspect}"
+    debug { "process_really_running?: <#{pid}> #{res.inspect}" }
     !!res[:result]
   end
 
   def send_signal(code)
     res = Eye::System.send_signal(self.pid, code)
 
-    msg = "send_signal #{code} to #{self.pid}"
+    msg = "send_signal #{code} to <#{self.pid}>"
     msg += ", error<#{res[:error]}>" if res[:error]
     info msg
 

data/lib/eye/process/watchers.rb

@@ -35,10 +35,10 @@ private
   def add_watcher(type, period = 2, subject = nil, &block)
     return if @watchers[type]
 
-    debug "adding watcher: #{type}(#{period})"
+    debug { "adding watcher: #{type}(#{period})" }
 
     timer = every(period.to_f) do
-      debug "check #{type}"
+      debug { "check #{type}" }
       block.call(subject)
     end
 

data/lib/eye/system.rb

@@ -1,5 +1,4 @@
 require 'shellwords'
-require 'pathname'
 require 'etc'
 require 'timeout'
 
@@ -101,7 +100,7 @@ module Eye::System
 
     # normalize file
     def normalized_file(file, working_dir = nil)
-      Pathname.new(file).expand_path(working_dir).to_s
+      File.expand_path(file, working_dir)
     end
 
     def spawn_options(config = {})

data/lib/eye/trigger.rb

@@ -49,7 +49,7 @@ class Eye::Trigger
     @process = process
     @full_name = @process.full_name if @process
 
-    debug "add #{options}"
+    debug { "add #{options}" }
   end
 
   def inspect
@@ -65,7 +65,7 @@ class Eye::Trigger
   end
 
   def notify(transition, reason)
-    debug "check (:#{transition.event}) :#{transition.from} => :#{transition.to}"
+    debug { "check (:#{transition.event}) :#{transition.from} => :#{transition.to}" }
     @reason = reason
     @transition = transition
 

data/lib/eye/trigger/flapping.rb

@@ -27,7 +27,7 @@ private
   end
 
   def on_flapping
-    debug 'flapping recognized!!!'
+    debug { 'flapping recognized!!!' }
 
     process.notify :error, 'flapping!'
     process.schedule :unmonitor, Eye::Reason.new(:flapping)

data/lib/eye/trigger/stop_children.rb

@@ -10,7 +10,7 @@ class Eye::Trigger::StopChildren < Eye::Trigger
   param_default :event, [:stopped, :crashed]
 
   def check(trans)
-    debug 'stopping children'
+    debug { 'stopping children' }
     process.children.pmap { |pid, c| c.stop }
   end
 

metadata

@@ -1,251 +1,251 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sigar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: forking
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.1
 description: Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI)
@@ -253,22 +253,23 @@ description: Process monitoring tool. Inspired from Bluepill and God. Requires R
 email: eye-rb@googlegroups.com
 executables:
 - eye
+- leye
 - loader_eye
-- runner
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/eye
+- bin/leye
 - bin/loader_eye
-- bin/runner
+- examples/delayed_job.eye
 - examples/dependency.eye
 - examples/notify.eye
 - examples/plugin/README.md
@@ -282,6 +283,7 @@ files:
 - examples/puma.eye
 - examples/rbenv.eye
 - examples/sidekiq.eye
+- examples/stress_test.eye
 - examples/test.eye
 - examples/thin-farm.eye
 - examples/unicorn.eye
@@ -380,12 +382,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []