eye 0.3.2 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f91b36c9b73d802f079d62a345bbf29fcb929768
-  data.tar.gz: 2953436d9e587ff52b0a2ee146c2ac52434e1662
+  metadata.gz: 2a4ce0513f92a734194ec12a2c10aa8cadcfaafa
+  data.tar.gz: 43e96f1ccc671f83454d790d8e546785b3cb8c18
 SHA512:
-  metadata.gz: 1569dabc95b8e86f63eaf7b3d921758638cd2183ea403610400f437f6824fe0d18d0b763c3ce2752ab6d2a63641d2755affd51137d134f6cf3adf2e6caa10869
-  data.tar.gz: 1e9d50a96ae0cc44d2ab218d45933ec4b3a49ec5686875351de2f6b5be10deaaa2e1843431bb88b89eb783c59a0c1f76d1ccda46ad915d11fc4e5da2c27640f1
+  metadata.gz: 780ee7abb50e1a473614d33e132ccbea9854cdf4e7f5b5ca77ee003caebcddf2759f2d6ae489f7585a915b8630d3813f60924e2762c224bd2f65ad51defcaddb
+  data.tar.gz: 26b46e22aeddce190a889072e88d41bb1d638db3147c6fe4cd79d6861ac5e11063de82deb0fa5e78ee34a8c106c2592c05db11748ff7569e6e0e2f7df2d95661

data/.gitignore

@@ -31,3 +31,4 @@ examples/work*.eye
 script
 [0-9].rb
 *.cache
+*.tmp

data/.rspec

@@ -1,2 +1,2 @@
 --color
---profile
+--format progress

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
+  - "1.9.2"
   - "1.9.3"
-script: COVA=1 bundle exec rake
+  - "2.0"
+script: bundle exec rake N=15

data/CHANGES.md

@@ -1,11 +1,20 @@
-0.3.3.dev
+0.4.dev
 ---------
+* pass tests on 1.9.2
+* relax activesupport dependency
+* change client-server protocol (requires `eye q && eye l` after update gem from 0.3.x)
+* not matching targets from different applications
+* improve triggers (custom, better flapping)
+* delete pid_file on crash for daemonize process
+* delete pid_file on stop for all process types (`clear_pid false` to disable)
+* parallel tests (from 30 mins to 3min)
+* update celluloid to 0.14
 
 0.3.2
 ---------
 * improve matching targers
 * possibility to add many checkers with the same type per process (ex: checks :http_2, ...)
-* add uid,gid options (only for ruby 2.0)
+* add uid, gid options (only for ruby 2.0)
 
 0.3.1
 -----

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in eye.gemspec
 gemspec
 
+gem 'parallel_tests', :git => "https://github.com/kostya/parallel_tests.git"

data/README.md

@@ -21,7 +21,7 @@ Config example, shows some typical processes and most of the options (see in exa
 examples/test.eye
 ```ruby
 # load submodules, here just for example
-Eye.load("./eye/*.rb") 
+Eye.load("./eye/*.rb")
 
 # Eye self-configuration section
 Eye.config do
@@ -46,6 +46,10 @@ Eye.application "test" do
     process :sample1 do
       pid_file "1.pid" # pid_path will be expanded with the working_dir
       start_command "ruby ./sample.rb"
+
+      # when no stop_command or stop_signals, default stop is [:TERM, 0.5, :KILL]
+      # default `restart` command is `stop; start`
+
       daemonize true
       stdall "sample1.log"
 
@@ -71,13 +75,13 @@ Eye.application "test" do
 
     start_timeout 5.seconds
     stop_grace 5.seconds
-  
+
     monitor_children do
       restart_command "kill -2 {PID}" # for this child process
       checks :memory, :below => 300.megabytes, :times => 3
     end
   end
-  
+
   # eventmachine process, daemonized with eye
   process :event_machine do |p|
     pid_file 'em.pid'
@@ -85,8 +89,8 @@ Eye.application "test" do
     stdout 'em.log'
     daemonize true
     stop_signals [:QUIT, 2.seconds, :KILL]
-    
-    checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2, 
+
+    checks :socket, :addr => "tcp://127.0.0.1:33221", :every => 10.seconds, :times => 2,
                     :timeout => 1.second, :send_data => "ping", :expect_data => /pong/
   end
 
@@ -96,7 +100,7 @@ Eye.application "test" do
     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, 
+    checks :http, :url => "http://127.0.0.1:33233/hello", :pattern => /World/, :every => 5.seconds,
                   :times => [2, 3], :timeout => 1.second
   end
 
@@ -117,12 +121,12 @@ Load also uses for config synchronization and load new application into runned e
 
 
 Process statuses:
-  
+
     $ eye i(nfo)
 
 ```
-test                       
-  samples                          
+test
+  samples
     sample1 ....................... up  (21:52, 0%, 13Mb, <4107>)
     sample2 ....................... up  (21:52, 0%, 12Mb, <4142>)
   event_machine ................... up  (21:52, 3%, 26Mb, <4112>)
@@ -134,7 +138,7 @@ test
 ```
 
 ### Commands:
-    
+
     start, stop, restart, delete, monitor, unmonitor
 
 Command params (with restart for example):
@@ -157,11 +161,11 @@ Config explain (for debug):
 
     $ eye e(xplain) examples/test.eye
 
-Log tracing:
+Log tracing (tail and grep):
 
-    $ eye trace 
-    $ eye tr test
-    $ eye tr sample
+    $ eye t(race)
+    $ eye t test
+    $ eye t sample
 
 Quit monitoring:
 

data/Rakefile

@@ -1,8 +1,15 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
 
+require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-task :default => :spec
+require 'parallel_tests/tasks'
+
+task :default => :pspecs
+
+task :pspecs do
+  Rake::Task['parallel:spec'].invoke(ENV['N'] || 8)
+end
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.verbose = false
 end
@@ -10,7 +17,7 @@ end
 task :env do
   require 'bundler/setup'
   require 'eye'
-  Eye::Control
+  Eye::Controller
   Eye::Process # preload
 end
 

data/bin/eye

@@ -6,11 +6,11 @@ require 'eye'
 gem 'thor'
 require 'thor'
 
-class Cli < Thor
+class Eye::Cli < Thor
 
   desc "info [MASK]", "show process statuses"
   def info(mask = nil)
-    print cmd(:info, mask)
+    print cmd(:info, *Array(mask))
   end
 
   desc "status ", "show process statuses"
@@ -21,9 +21,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    
-    print cmd(:xinfo, options[:config], options[:show_processes])
+  method_option :processes, :type => :boolean, :aliases => "-p"
+  def xinfo
+    print cmd(:xinfo, :config => options[:config], :processes => options[:processes])
   end
 
   desc "oinfo", "onelined info"
@@ -55,11 +55,14 @@ class Cli < Thor
     res = _cmd(:quit)
 
     # if eye server got crazy, stop by force
-    ensure_stop_previous_server if res != :corrupred_marshal
+    ensure_stop_previous_server if res != :corrupred_data
 
-    say "stopped...", :yellow
+    # remove pid_file
+    File.delete(Eye::Settings.pid_path) if File.exists?(Eye::Settings.pid_path)
+
+    say "quit...", :yellow
   end
-  
+
   [:start, :stop, :restart, :unmonitor, :monitor, :delete, :match].each do |_cmd|
     desc "#{_cmd} MASK[,...]", "#{_cmd} app,group or process"
     define_method(_cmd) do |*targets|
@@ -100,11 +103,11 @@ class Cli < Thor
 
     Eye::System.host = options[:host] if options[:host]
     Eye::Dsl.verbose = options[:verbose]
-    
+
     if RUBY_VERSION < '1.9'
       say_load_result cmd(:check, conf), :syntax => true
     else
-      say_load_result Eye::Control.check(conf), :syntax => true
+      say_load_result Eye::Controller.new.check(conf), :syntax => true
     end
   end
 
@@ -120,7 +123,7 @@ class Cli < Thor
     if RUBY_VERSION < '1.9'
       say_load_result cmd(:explain, conf), :print_config => true, :syntax => true
     else
-      say_load_result Eye::Control.explain(conf), :print_config => true, :syntax => true
+      say_load_result Eye::Controller.new.explain(conf), :print_config => true, :syntax => true
     end
   end
 
@@ -152,7 +155,7 @@ private
   rescue Errno::ECONNREFUSED, Errno::ENOENT
     :not_started
   end
-  
+
   def cmd(cmd, *args)
     res = _cmd(cmd, *args)
 
@@ -161,22 +164,26 @@ private
     elsif res == :timeouted
       error! "eye does not answer, timeouted..."
     end
-    
+
     res
   end
-  
+
   def server_started?
     _cmd(:ping) == :pong
   end
-  
+
   def say_load_result(res = {}, opts = {})
     error!(res) unless res.is_a?(Hash)
     say_filename = (res.size > 1)
     say "eye started!", :green if opts[:started]
+    error = false
     res.each do |filename, _res|
       say "#{filename}: ", nil, true if say_filename
       show_load_message(_res, opts)
+      error = true if _res[:error]
     end
+
+    exit(1) if error
   end
 
   def show_load_message(res, opts = {})
@@ -184,7 +191,6 @@ private
       say res[:message], :red
       res[:backtrace].to_a.each{|line| say line, :red }
     else
-      all_error = false
       if opts[:syntax]
         say "config ok!", :green if !res[:empty]
       else
@@ -193,22 +199,30 @@ private
 
       if opts[:print_config]
         require 'pp'
-        PP.pp res[:config]
+        PP.pp res[:config], STDOUT, 150
       end
     end
   end
- 
+
   def send_command(_cmd, *args)
     res = cmd(_cmd, *args)
     if res == :unknown_command
       error! "unknown command :#{_cmd}"
-    elsif res == :corrupred_marshal
+    elsif res == :corrupred_data
       error! "something crazy wrong, check eye logs!"
-    elsif res == []
-      error! "command :#{_cmd}, targets not found!"
+    elsif res.is_a?(Hash)
+      if res[:error]
+        error! "Error: #{res[:error]}"
+      elsif res = res[:result]
+        if res == []
+          error! "command :#{_cmd}, targets not found!"
+        else
+          say "command :#{_cmd} sended to [#{res * ", "}]"
+        end
+      end
     else
-      say "command :#{_cmd} sended to [#{res * ", "}]"
-    end        
+      error! "unknown result #{res.inspect}"
+    end
   end
 
   def log_trace(tag = '')
@@ -219,7 +233,7 @@ private
       error! "log file not found #{log_file.inspect}"
     end
   end
-  
+
   def loader_path
     if RUBY_VERSION < '1.9'
       begin
@@ -230,8 +244,8 @@ private
 
     filename = File.expand_path(File.join(File.dirname(__FILE__), %w[loader_eye]))
     File.exists?(filename) ? filename : nil
-  end  
-  
+  end
+
   def ruby_path
     require 'rbconfig'
     RbConfig::CONFIG['bindir'] + "/ruby"
@@ -304,4 +318,4 @@ private
 
 end
 
-Cli.start
+Eye::Cli.start

data/examples/process_thin.rb

@@ -23,7 +23,7 @@ def thin(proxy, port)
 
     stdall "thin.stdall.log"
 
-    checks :http, :url => "http://127.0.0.1:#{port}/hello", :pattern => /World/, 
+    checks :http, :url => "http://127.0.0.1:#{port}/hello", :pattern => /World/,
                   :every => 5.seconds, :times => [2, 3], :timeout => 1.second
   end
 end

data/examples/processes/em.rb

@@ -24,7 +24,7 @@ class Echo < EM::Connection
 
   def unbind
      puts "-- someone disconnected from the echo server!"
-  end  
+  end
 end
 
 class EchoObj < EM::Connection
@@ -41,7 +41,7 @@ class EchoObj < EM::Connection
 
   def unbind
     puts "-- someone disconnected from the echo server!"
-  end  
+  end
 end
 
 trap "QUIT" do

data/examples/processes/forking.rb

@@ -4,14 +4,14 @@ require 'forking'
 root = File.expand_path(File.dirname(__FILE__))
 
 f = Forking.new(:name => 'forking', :working_dir => root,
-    :log_file => "#{root}/forking.log", 
+    :log_file => "#{root}/forking.log",
     :pid_file => "#{root}/forking.pid", :sync_log => true)
 
 3.times do |i|
   f.spawn(:log_file => "#{root}/child#{i}.log", :sync_log => true) do
     $0 = "forking child"
     loop do
-      p "#{Time.now} - #{Time.now.to_f} - #{i} - tick" 
+      p "#{Time.now} - #{Time.now.to_f} - #{i} - tick"
       sleep 0.1
     end
   end

data/examples/processes/sample.rb

@@ -14,19 +14,19 @@ optparse = OptionParser.new do|opts|
     exit
   end
 
-  opts.on( '-p', '--pid FILE', 'pid_file' ) do |a| 
+  opts.on( '-p', '--pid FILE', 'pid_file' ) do |a|
     options[:pid_file] = a
   end
 
-  opts.on( '-l', '--log FILE', 'log_file' ) do |a| 
+  opts.on( '-l', '--log FILE', 'log_file' ) do |a|
     options[:log_file] = a
   end
 
-  opts.on( '-L', '--lock FILE', 'lock_file' ) do |a| 
+  opts.on( '-L', '--lock FILE', 'lock_file' ) do |a|
     options[:lock_file] = a
   end
 
-  opts.on( '-d', '--daemonize', 'Daemonize' ) do 
+  opts.on( '-d', '--daemonize', 'Daemonize' ) do
     options[:daemonize] = true
   end
 
@@ -34,7 +34,7 @@ optparse = OptionParser.new do|opts|
     options[:daemonize_delay] = d
   end
 
-  opts.on( '-r', '--raise', 'Raised execution' ) do 
+  opts.on( '-r', '--raise', 'Raised execution' ) do
     options[:raise] = true
   end
 

data/examples/rbenv.eye

@@ -1,7 +1,7 @@
 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 ]))
-  
+
   process "some_process" do
     pid_file "some.pid"
     start_command "ruby some.rb"

data/examples/sidekiq.eye

@@ -9,7 +9,7 @@ def sidekiq_process(proxy, name)
     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
@@ -18,6 +18,6 @@ end
 Eye.application :sidekiq_test do
   working_dir File.expand_path(File.join(File.dirname(__FILE__), %w[ processes ]))
   env "RAILS_ENV" => 'production'
- 
+
   sidekiq_process self, :sidekiq
 end