eye 0.7 → 0.8.celluloid15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af465bb7737a6f1891bc3ab6ee5d9ebe9547530a
-  data.tar.gz: 929efa8c2932925ef6aa2974377982a16e50494e
+  metadata.gz: 39b53d19c30acc0229dfdec07e5c135d8cc997fc
+  data.tar.gz: 82f8d45c31474a83b479376922899f39cfe9e232
 SHA512:
-  metadata.gz: 9bb24f0bc0d47d2345aa0a1f708ad76486cfbe72363cdd6b6410133b912fc8cf47bddde0995422272c7688338ca986386ec3e8b4e9234b09d82adcc9dda155a6
-  data.tar.gz: edf8b2a9874f4d58423d501bbe130e75109317be53a05d418118782f127ba5b4637d5109674c1621f21ceb5a04022cbaa6ba8864f2ab34a690c1b1b277798b44
+  metadata.gz: 30546ea03294ca6ad90a9f6cc6ed82aeacd386163759a08f6ab51051234835eef9591a73b934eb91f0701574e57b016ff7ca8437990a00f826bc7b5bdad3edde
+  data.tar.gz: 23e7c50c282eefa9a41420d07704007dc18fc1f1ddfa804f56a659263115db76031be59686dac00499da1eda51db03891b9fa34cc7f6e624f87cb01ce69fd782

data/.rubocop.yml

@@ -0,0 +1,141 @@
+AllCops:
+  Include:
+    - '**/*.eye'
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/eye/utils/mini_active_support.rb'
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact
+
+Style/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines
+
+Style/EmptyLinesAroundModuleBody:
+  EnforcedStyle: empty_lines
+  Exclude:
+    - 'lib/eye.rb'
+
+Style/RegexpLiteral:
+  EnforcedStyle: percent_r
+  Exclude:
+    - 'examples/**/*'
+
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Lint/EndAlignment:
+  AlignWith: variable
+
+Style/IndentHash:
+  EnforcedStyle: consistent
+
+Style/Lambda:
+  Exclude:
+    - 'examples/**/*'
+
+Style/BlockDelimiters:
+  Exclude:
+    - 'examples/**/*'
+
+Style/CaseIndentation:
+  IndentOneStep: true
+  IndentWhenRelativeTo: end
+
+Style/HashSyntax:
+  Exclude:
+    - 'lib/eye/process/states.rb'
+
+Style/RaiseArgs:
+  EnforcedStyle: exploded
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%w': '[]'
+    '%r': '[]'
+    '%': '{}'
+
+Metrics/LineLength:
+  Max: 142
+
+Metrics/PerceivedComplexity:
+  Max: 15
+  Exclude:
+    - 'lib/eye/cli/render.rb'
+
+Metrics/BlockNesting:
+  Max: 3
+  Exclude:
+    - 'lib/eye/trigger/starting_guard.rb'
+
+Metrics/MethodLength:
+  Max: 45
+
+Metrics/CyclomaticComplexity:
+  Max: 19
+
+Metrics/ClassLength:
+  Max: 200
+
+Metrics/ModuleLength:
+  Max: 200
+  Exclude:
+    - 'lib/eye/process/commands.rb'
+
+Metrics/AbcSize:
+  Max: 60
+
+Style/GuardClause:
+  MinBodyLength: 10
+
+Style/IfUnlessModifier:
+  MaxLineLength: 50
+
+Lint/RescueException:
+  Exclude:
+    - 'lib/eye/checker/socket.rb'
+    - 'lib/eye/controller/load.rb'
+    - 'lib/eye/logger.rb'
+
+Style/RedundantSelf:
+  Exclude:
+    - 'lib/eye/process/**/*' # self.pid is nicer
+
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+Style/Documentation:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Lint/Eval:
+  Enabled: false
+
+Lint/Void:
+  Exclude:
+    - Rakefile
+    - bin/loader_eye
+    - lib/eye/controller.rb
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Style/AccessorMethodName:
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Enabled: false
+
+Style/RescueModifier:
+  Enabled: false
+
+Lint/HandleExceptions:
+  Enabled: false
+
+Lint/LiteralInInterpolation:
+  Exclude:
+    - 'lib/eye/notify/jabber.rb'
+    - 'lib/eye/notify/slack.rb'
+    - 'lib/eye/process/commands.rb'

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-  - "2.1"
-  - "2.2.2"
-script: bundle exec rake split_test N=15
+  - "2.1.7"
+  - "2.2.3"
+script:
+  - bundle exec rake N=16
+  - bundle exec rubocop

data/CHANGES.md

@@ -1,3 +1,11 @@
+0.8
+-------
+* info, xinfo, oinfo, history now support -j flag, to output json
+* leye: many fixes (--eyehome, --eyefile)
+* add flapping reretry_in (#152)
+* add check_identity of processes, avoid many bugs with wrong pid_files, or auto changed pids (#62)
+* update Celluloid to 0.17
+
 0.7
 -------
 * add `stdall syslog`, example: https://github.com/kostya/eye/blob/master/examples/syslog.eye
@@ -13,7 +21,7 @@
 * some fixes in flapping
 * add proxy_url to http check
 * process with children, shows children history now
-* Update Celluloid to 0.16.0
+* update Celluloid to 0.16
 
 0.6.4
 -----

data/README.md

@@ -98,7 +98,7 @@ Eye.application 'test' do
   end
 
   # eventmachine process, daemonized with eye
-  process :event_machine do |p|
+  process :event_machine do
     pid_file 'em.pid'
     start_command 'ruby em.rb'
     stdout 'em.log'
@@ -118,7 +118,6 @@ Eye.application 'test' do
     check :http, url: 'http://127.0.0.1:33233/hello', pattern: /World/,
                  every: 5.seconds, times: [2, 3], timeout: 1.second
   end
-
 end
 ```
 
@@ -137,6 +136,10 @@ 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):
+
+    /etc/eye.conf
+    ~/.eyeconfig
 
 Process statuses:
 

data/Rakefile

@@ -1,21 +1,21 @@
 #!/usr/bin/env rake
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
 
 Coveralls::RakeTask.new
 
-task :default => :pspec
+task :default => :split_test
 
-desc "run parallel tests"
+desc 'run parallel tests'
 task :pspec do
   dirname = File.expand_path(File.dirname(__FILE__))
   cmd = "bundle exec parallel_rspec -n #{ENV['N'] || 10} --runtime-log '#{dirname}/spec/weights.txt' #{dirname}/spec"
   abort unless system(cmd)
 end
 
-desc "run parallel split tests"
+desc 'run parallel split tests'
 task :split_test do
   dirname = File.expand_path(File.dirname(__FILE__))
   ENV['PARALLEL_SPLIT_TEST_PROCESSES'] = (ENV['N'] || 10).to_s
@@ -39,7 +39,7 @@ task :env do
   Eye::Process
 end
 
-desc "graph"
+desc 'graph'
 task :graph => :env do
-  StateMachine::Machine.draw("Eye::Process")
+  StateMachine::Machine.draw('Eye::Process')
 end

data/bin/leye

@@ -6,7 +6,7 @@ require 'eye'
 #  which looking for Eyefile
 #  like foreman
 
-while true
+loop do
   if ARGV[0] == '--eyefile'
     ARGV.shift
     ENV['EYE_FILE'] = File.expand_path(ARGV.shift.to_s)
@@ -18,13 +18,18 @@ while true
   end
 end
 
-unless Eye::Local.eyefile
-  puts "\033[31mNot found Eyefile (in #{File.expand_path('.')})\033[0m"
+if ENV['EYE_HOME'] && !File.directory?(File.expand_path(ENV['EYE_HOME']))
+  puts "\033[31mEYE_HOME is not directory (#{File.expand_path(ENV['EYE_HOME'])})\033[0m"
+  exit 1
+end
+
+unless Eye::Local.eyefile || ENV['EYE_HOME']
+  puts "\033[31mNot found Eyefile (in #{File.expand_path(ENV['EYE_HOME'] || '.')})\033[0m"
   exit 1
 end
 
 unless ENV.key?('EYE_HOME')
-  Eye::Local.dir = File.join(File.dirname(Eye::Local.eyefile), '.eye')
+  ENV['EYE_HOME'] = File.dirname(Eye::Local.eyefile)
 end
 
 Eye::Local.local_runner = true

data/bin/loader_eye

@@ -4,39 +4,38 @@ require 'eye/loader'
 require 'optparse'
 require 'eye'
 
-options = {:debug => false}
+options = { debug: false }
 
 OptionParser.new do |opts|
-  opts.on( '-h', '--help', 'Display this screen' ) do
+  opts.on('-h', '--help', 'Display this screen') do
     puts opts
     exit
   end
 
-  opts.on( '-c', '--config CONFIG', 'load with config' ) do |config_path|
+  opts.on('-c', '--config CONFIG', 'load with config') do |config_path|
     options[:config] = config_path
   end
 
-  opts.on( '-s', '--socket SOCKET', 'start listen on socket' ) do |socket_path|
+  opts.on('-s', '--socket SOCKET', 'start listen on socket') do |socket_path|
     options[:socket_path] = socket_path
   end
 
-  opts.on( '-l', '--logger LOGGER', 'custom logger' ) do |logger|
+  opts.on('-l', '--logger LOGGER', 'custom logger') do |logger|
     options[:logger] = logger
   end
 
-  opts.on( '-dr', '--dir DIR', 'Dir for local runner' ) do |dir|
+  opts.on('-d', '--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|
+  opts.on('-a', '--stop_all', 'Stop all on exit') do
     options[:stop_all] = true
   end
 
-  opts.on( '-d', '--debug', 'debug info to logger' ) do
+  opts.on('-g', '--debug', 'debug info to logger') do
     options[:debug] = true
   end
-
 end.parse!
 
 Eye::Local.ensure_eye_dir
@@ -61,12 +60,12 @@ Eye::Control.set_proc_line
 
 server.async.run
 
-trap("USR1") { Eye::Logger.reopen }
-trap("USR2") { GC.start }
-trap("INT")  { Eye::Logger.info("INT signal <#{$$}>"); exit }
-trap("QUIT") { Eye::Logger.info("QUIT signal <#{$$}>"); exit }
-trap("TERM") { Eye::Logger.info("TERM signal <#{$$}>"); exit }
+trap('USR1') { Eye::Logger.reopen }
+trap('USR2') { GC.start }
 
 at_exit { Eye::Control.command(:stop_all) } if options[:stop_all]
 
-sleep
+begin
+  sleep
+rescue Interrupt
+end

data/examples/custom_check.eye

@@ -0,0 +1,24 @@
+# This example shows how to write custom checks:
+#   We check process procline every 1.second, and if it matches `haha`
+#   send TERM signal
+
+class MyCheck < Eye::Checker::Custom
+
+  def get_value
+    Eye::SystemResources.args(@pid)
+  end
+
+  def good?(value)
+    !(value =~ /haha/)
+  end
+
+end
+
+Eye.app :bla do
+  process :a do
+    start_command "ruby -e 'sleep 10; $0 = %{HAHA}.downcase; sleep'"
+    daemonize true
+    pid_file '/tmp/1.pid'
+    check :my_check, every: 1.second, fires: -> { send_signal(:TERM) }
+  end
+end

data/examples/custom_trigger.eye

@@ -0,0 +1,30 @@
+# send notify when many times crashed process, finally resolved
+
+class Eye::Trigger::FixCrash < Eye::Trigger::Custom
+
+  param :times, Fixnum, nil, 1
+  param_default :to, :up
+
+  def check(_)
+    # process states here like this: [..., :starting, :down, :starting, :down, :starting, :up]
+    states = process.states_history.states
+
+    # states to compare with
+    compare = [:starting, :down] * times + [:starting, :up]
+
+    if states[-compare.length..-1] == compare
+      process.notify(:info, 'yahho, process up')
+    end
+  end
+
+end
+
+Eye.app :custom_trigger do
+  trigger :fix_crash
+
+  process :some do
+    pid_file '/tmp/custom_trigger_some.pid'
+    start_command "ruby -e 's = `cat /tmp/bla`; exit(1) unless s =~ /bla/; loop { sleep 1 } '"
+    daemonize!
+  end
+end

data/examples/delayed_job.eye

@@ -1,6 +1,6 @@
 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
@@ -15,10 +15,10 @@ Eye.application 'delayed_job' do
   group 'dj' do
     chain grace: 5.seconds
 
-    (1 .. workers_count).each do |i|
+    (1..workers_count).each do |i|
       process "dj-#{i}" do
         pid_file "tmp/pids/delayed_job.#{i}.pid"
-        start_command "rake jobs:work"
+        start_command 'rake jobs:work'
         daemonize true
         stop_signals [:INT, 30.seconds, :TERM, 10.seconds, :KILL]
         stdall "log/dj-#{i}.log"

data/examples/dependency.eye

@@ -2,37 +2,36 @@
 
 Eye.app :dependency do
   process(:a) do
-    start_command "sleep 100"
+    start_command 'sleep 100'
     daemonize true
-    pid_file "/tmp/test_process_a.pid"
+    pid_file '/tmp/test_process_a.pid'
   end
 
   process(:b) do
-    start_command "sleep 100"
+    start_command 'sleep 100'
     daemonize true
-    pid_file "/tmp/test_process_b.pid"
+    pid_file '/tmp/test_process_b.pid'
     depend_on :a
   end
 
   process(:c) do
-    start_command "sleep 100"
+    start_command 'sleep 100'
     daemonize true
-    pid_file "/tmp/test_process_c.pid"
+    pid_file '/tmp/test_process_c.pid'
     depend_on :a
   end
 
   process(:d) do
-    start_command "sleep 100"
+    start_command 'sleep 100'
     daemonize true
-    pid_file "/tmp/test_process_d.pid"
+    pid_file '/tmp/test_process_d.pid'
     depend_on :b
   end
 
   process(:e) do
-    start_command "sleep 100"
+    start_command 'sleep 100'
     daemonize true
-    pid_file "/tmp/test_process_e.pid"
+    pid_file '/tmp/test_process_e.pid'
     depend_on [:d, :c]
   end
-
 end