eye 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc90dbe500dcdec39abb07eed2c8a9391cb8e619
-  data.tar.gz: b0c7fe91dad6d81afa03467fa4af801e9a8cd619
+  metadata.gz: 7fb55aab9464c85b0d2f52d9ecb83f2ef8f6cbc7
+  data.tar.gz: b36569fbe32ec49ece27216d1fbb340750a6116d
 SHA512:
-  metadata.gz: 3211c83195c0fccacbe73705a2f822079f2cdeecfa1ab5b1aa43587574ed2fe7369a60b2ca2a5365a4fdaba97f3d1330bbd4c280e607f35140d84ea954984b81
-  data.tar.gz: 5e7cab54e3f1ceae0d3edf0f54e73976b24c61258f1e770508a1be20ae7b87c12acd9edef70212bf2e85c6f7efbaa1c617e1aeb627ec07db40b28b688981ad37
+  metadata.gz: 1de45573f67e9a8b0b8a7a3d93ef19396d0561bcf780d73cb9eee63de3607958c1c634a6edd48556c95460492b407b05ee536cc5489974073f6618354b629cb2
+  data.tar.gz: 51c5d3ebd48ad1b339a493897a00fe354ee4d9b1c884c53ff198ba253d27a3216c909a248166d6c18591f06460becb0029fedc93db13bd0319953beded5ec94f

data/.rubocop.yml

@@ -27,10 +27,10 @@ Style/MutableConstant:
 Style/ClassAndModuleChildren:
   EnforcedStyle: compact
 
-Style/EmptyLinesAroundClassBody:
+Layout/EmptyLinesAroundClassBody:
   EnforcedStyle: empty_lines
 
-Style/EmptyLinesAroundModuleBody:
+Layout/EmptyLinesAroundModuleBody:
   EnforcedStyle: empty_lines
   Exclude:
     - 'lib/eye.rb'
@@ -40,13 +40,13 @@ Style/RegexpLiteral:
   Exclude:
     - 'examples/**/*'
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
 
-Style/IndentHash:
+Layout/IndentHash:
   EnforcedStyle: consistent
 
 Style/Lambda:
@@ -57,9 +57,9 @@ Style/BlockDelimiters:
   Exclude:
     - 'examples/**/*'
 
-Style/CaseIndentation:
+Layout/CaseIndentation:
   IndentOneStep: true
-  IndentWhenRelativeTo: end
+  EnforcedStyle: end
 
 Style/HashSyntax:
   Exclude:
@@ -132,7 +132,7 @@ Style/Documentation:
 Style/DoubleNegation:
   Enabled: false
 
-Lint/Eval:
+Security/Eval:
   Enabled: false
 
 Lint/Void:
@@ -144,7 +144,7 @@ Lint/Void:
 Lint/AssignmentInCondition:
   Enabled: false
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: false
 
 Style/SpecialGlobalVars:
@@ -161,3 +161,21 @@ Lint/LiteralInInterpolation:
     - 'lib/eye/notify/jabber.rb'
     - 'lib/eye/notify/slack.rb'
     - 'lib/eye/process/commands.rb'
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/SafeNavigation:
+  Enabled: false
+
+Security/MarshalLoad:
+  Enabled: false
+
+Gemspec/OrderedDependencies:
+  Enabled: false
+
+Style/Dir:
+  Enabled: false

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.9.3
+-----
+* fix process hangs in status :starting, in some rare cases
+* add handling quotes in load_env
+
 0.9.1
 -------
 * fix client protocol compatibility with old server

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 gemspec
 
+gem 'fakeweb', git: 'https://github.com/chrisk/fakeweb.git'
+gem 'json'
 gem 'rack', '1.6.4'
-gem 'json', '1.8.3'

data/README.md

@@ -10,10 +10,10 @@ Little demo, shows general commands and how chain works:
 
 [![Eye](https://raw.github.com/kostya/stuff/master/eye/eye.png)](https://raw.github.com/kostya/stuff/master/eye/eye.gif)
 
-Recommended installation on the server (system wide):
+Installation:
 
-    $ sudo /usr/local/ruby/1.9.3/bin/gem install eye
-    $ sudo ln -sf /usr/local/ruby/1.9.3/bin/eye /usr/local/bin/eye
+    $ gem install sigar -- --with-cppflags="-fgnu89-inline"
+    $ gem install eye
 
 
 ###  Why?

data/Rakefile

@@ -5,7 +5,7 @@ require 'coveralls/rake/task'
 
 Coveralls::RakeTask.new
 
-task :default => :split_test
+task default: :split_test
 
 desc 'run parallel tests'
 task :pspec do
@@ -24,7 +24,7 @@ end
 
 task :remove_coverage do
   require 'fileutils'
-  FileUtils.rm_rf(File.expand_path(File.join(File.dirname(__FILE__), %w{ coverage })))
+  FileUtils.rm_rf(File.expand_path(File.join(File.dirname(__FILE__), %w[coverage])))
 end
 
 task :env do
@@ -35,6 +35,6 @@ task :env do
 end
 
 desc 'graph'
-task :graph => :env do
+task graph: :env do
   StateMachine::Machine.draw('Eye::Process')
 end

data/examples/custom_check.eye

@@ -9,7 +9,7 @@ class MyCheck < Eye::Checker::Custom
   end
 
   def good?(value)
-    !(value =~ /haha/)
+    value !~ /haha/
   end
 
 end

data/examples/plugin/plugin.rb

@@ -1,5 +1,4 @@
 class Reactor
-
   include Celluloid
 
   def initialize(interval, filename)

data/examples/processes/em.rb

@@ -39,7 +39,8 @@ class EchoObj < EM::Connection
     puts '-- someone connected to the echo server!'
   end
 
-  def receive_object(obj) # {:command => 'ping'}
+  # {:command => 'ping'}
+  def receive_object(obj)
     puts "receive #{obj.inspect}"
     send_object(answer(obj[:command]).chop)
   end

data/examples/processes/sample.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'optparse'
 
 # This hash will hold all of the options

data/examples/processes/thin.ru

@@ -5,8 +5,9 @@ class Test < Sinatra::Base
 
   get '/hello' do
     sleep 0.5
-    "Hello World!"
+    'Hello World!'
   end
+
 end
 
 run Test.new

data/lib/eye.rb

@@ -1,6 +1,6 @@
 module Eye
-  VERSION   = '0.9.2'
-  ABOUT     = "Eye v#{VERSION} (c) 2012-2016 @kostya"
+  VERSION   = '0.9.3'
+  ABOUT     = "Eye v#{VERSION} (c) 2012-2017 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 
   autoload :Process,        'eye/process'

data/lib/eye/application.rb

@@ -48,7 +48,7 @@ class Eye::Application
 
   def sub_object?(obj)
     res = @groups.include?(obj)
-    res = @groups.any? { |gr| gr.sub_object?(obj) } unless res
+    res ||= @groups.any? { |gr| gr.sub_object?(obj) }
     res
   end
 

data/lib/eye/checker.rb

@@ -50,7 +50,6 @@ class Eye::Checker
 
   def self.create(pid, options = {}, process = nil)
     get_class(options[:type]).new(pid, options, process)
-
   rescue Object => ex
     log_ex(ex)
     nil
@@ -128,7 +127,6 @@ class Eye::Checker
 
     info { "#{last_human_values} => #{result ? 'OK' : 'Fail'}" }
     result
-
   rescue Object => ex
     raise(ex) if ex.class == Celluloid::TaskTerminated
     log_ex(ex)
@@ -221,8 +219,7 @@ class Eye::Checker
     Eye::Checker.const_set(name, base)
   end
 
-  def self.requires
-  end
+  def self.requires; end
 
   class CustomCell < Eye::Checker
 

data/lib/eye/child_process.rb

@@ -90,7 +90,8 @@ class Eye::ChildProcess
     self_status_data(opts)
   end
 
-  def prepare_command(command) # override
+  # override
+  def prepare_command(command)
     super.gsub('{PARENT_PID}', @parent_pid.to_s)
   end
 

data/lib/eye/config.rb

@@ -95,8 +95,8 @@ class Eye::Config
   end
 
   def each_process(&block)
-    applications.each_value do |app_cfg|
-      (app_cfg[:groups] || {}).each_value do |gr_cfg|
+    applications.each do |_, app_cfg|
+      (app_cfg[:groups] || {}).each do |_, gr_cfg|
         (gr_cfg[:processes] || {}).each_value(&block)
       end
     end
@@ -111,14 +111,14 @@ class Eye::Config
   end
 
   def delete_group(name)
-    applications.each do |_app_name, app_cfg|
+    applications.each do |_, app_cfg|
       (app_cfg[:groups] || {}).delete(name)
     end
   end
 
   def delete_process(name)
-    applications.each do |_app_name, app_cfg|
-      (app_cfg[:groups] || {}).each do |_gr_name, gr_cfg|
+    applications.each do |_, app_cfg|
+      (app_cfg[:groups] || {}).each do |_, gr_cfg|
         (gr_cfg[:processes] || {}).delete(name)
       end
     end

data/lib/eye/logger.rb

@@ -6,7 +6,7 @@ class Eye::Logger
 
   class InnerLogger < Logger
 
-    FORMAT = '%d.%m.%Y %H:%M:%S'.freeze
+    FORMAT = '%Y.%m.%d %H:%M:%S'.freeze
 
     def initialize(*args)
       super

data/lib/eye/notify.rb

@@ -47,7 +47,6 @@ class Eye::Notify
     else
       create_proc[needed_hash]
     end
-
   rescue Object => ex
     log_ex(ex)
   end
@@ -99,8 +98,7 @@ class Eye::Notify
     Eye::Dsl::ConfigOpts.add_notify(type)
   end
 
-  def self.requires
-  end
+  def self.requires; end
 
   class Custom < Eye::Notify
 

data/lib/eye/process/children.rb

@@ -48,6 +48,7 @@ module Eye::Process::Children
   end
 
   def remove_children
+    # here should .keys (not each_key), as it copy array of keys
     children.keys.each { |child_pid| clear_child(child_pid) }
   end
 

data/lib/eye/process/commands.rb

@@ -229,7 +229,7 @@ private
 
     sleep_grace(:start_grace)
 
-    case load_external_pid_file
+    case load_res = load_external_pid_file
       when :ok
         res.merge(pid: self.pid)
       when :no_pid_file
@@ -241,6 +241,11 @@ private
         error "exit status #{res[:exitstatus]}, process <#{@last_loaded_pid}> (from #{self[:pid_file_ex]}) was not found; " \
           "ensure that the pid_file is being updated correctly (#{check_logs_str})"
         { error: :not_really_running }
+      else
+        # really strange case
+        error "exit status #{res[:exitstatus]}, process <#{@last_loaded_pid}> (from #{self[:pid_file_ex]}) #{load_res}; " \
+          "this is really strange case, like timestamp of server was updated, may be need to reload eye (#{check_logs_str})"
+        { error: load_res }
     end
   end
 

data/lib/eye/process/data.rb

@@ -65,7 +65,7 @@ module Eye::Process::Data
 
   def sub_object?(obj)
     return false if self.class == Eye::ChildProcess
-    self.children.values.each { |child| return true if child == obj }
+    self.children.each { |_, child| return true if child == obj }
     false
   end
 

data/lib/eye/process/scheduler.rb

@@ -92,7 +92,7 @@ module Eye::Process::Scheduler
     return false if call[:by] != :user && equal_action_call?(@scheduled_call, call)
 
     # check any equal call in queue scheduler_calls
-    !scheduler_calls.any? { |c| equal_action_call?(c, call) }
+    scheduler_calls.none? { |c| equal_action_call?(c, call) }
   end
 
   def equal_action_call?(call1, call2)

data/lib/eye/process/trigger.rb

@@ -1,7 +1,7 @@
 module Eye::Process::Trigger
 
   def add_triggers
-    (self[:triggers] || {}).each { |_type, cfg| add_trigger(cfg) }
+    (self[:triggers] || {}).each_value { |cfg| add_trigger(cfg) }
   end
 
   def remove_triggers

data/lib/eye/process/watchers.rb

@@ -32,7 +32,7 @@ module Eye::Process::Watchers
   end
 
   def remove_watchers
-    @watchers.each { |_, h| h[:timer].cancel }
+    @watchers.each_value { |h| h[:timer].cancel }
     @watchers = {}
   end
 

data/lib/eye/system_resources.rb

@@ -21,7 +21,8 @@ class Eye::SystemResources
       cache.children(parent_pid)
     end
 
-    def start_time(pid) # unixtime
+    # unixtime
+    def start_time(pid)
       if cpu = cache.proc_cpu(pid)
         cpu.start_time.to_i / 1000
       end

data/lib/eye/trigger.rb

@@ -119,8 +119,7 @@ class Eye::Trigger
     Eye::Trigger.const_set(name, base)
   end
 
-  def self.requires
-  end
+  def self.requires; end
 
   class Custom < Eye::Trigger
 

data/lib/eye/trigger/check_dependency.rb

@@ -13,7 +13,7 @@ private
       Eye::Control.find_nearest_process(name, process.group_name_pure, process.app_name)
     end
 
-    processes = processes.compact.select { |p| p.state_name != :unmonitored }
+    processes = processes.compact.reject { |p| p.state_name == :unmonitored }
     return if processes.empty?
     processes = Eye::Utils::AliveArray.new(processes)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid