eye 0.3.2 → 0.4

data/lib/eye/client.rb

@@ -7,11 +7,11 @@ class Eye::Client
   def initialize(socket_path)
     @socket_path = socket_path
   end
-  
+
   def command(cmd, *args)
-    attempt_command([cmd, *args] * '|')
+    attempt_command(Marshal.dump([cmd, *args]))
   end
-  
+
   def attempt_command(pack)
     Timeout.timeout(Eye::Settings.client_timeout) do
       return send_request(pack)
@@ -23,10 +23,10 @@ class Eye::Client
 
   def send_request(pack)
     UNIXSocket.open(@socket_path) do |socket|
-      socket.puts(pack)
+      socket.write(pack)
       data = socket.read
-      res = Marshal.load(data) rescue :corrupred_marshal
+      res = Marshal.load(data) rescue :corrupred_data
     end
   end
-  
+
 end

data/lib/eye/config.rb

@@ -32,7 +32,7 @@ class Eye::Config
 
     # Check dublicates of the full pid_file
 
-    dubl_pids = all_processes.each_with_object(Hash.new(0)) do |o, h| 
+    dubl_pids = all_processes.each_with_object(Hash.new(0)) do |o, h|
       ex_pid_file = Eye::System.normalized_file(o[:pid_file], o[:working_dir])
       h[ex_pid_file] += 1
     end
@@ -43,7 +43,7 @@ class Eye::Config
     end
 
     # Check dublicates of the full_name
-    dubl_names = all_processes.each_with_object(Hash.new(0)) do |o, h| 
+    dubl_names = all_processes.each_with_object(Hash.new(0)) do |o, h|
       full_name = "#{o[:application]}:#{o[:group]}:#{o[:name]}"
       h[full_name] += 1
     end

data/lib/eye/controller.rb

@@ -6,10 +6,13 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/numeric'
 require 'active_support/core_ext/string/filters'
+require 'active_support/core_ext/array/extract_options'
 
-require_relative 'utils/leak_19'
+require_relative 'utils/celluloid_klass'
+require_relative 'utils/pmap'
 
-Eye.send(:extend, Eye::Logger::Helpers)
+# Extend all objects with logger
+Object.send(:include, Eye::Logger::ObjectExt)
 
 class Eye::Controller
   include Celluloid
@@ -22,7 +25,6 @@ class Eye::Controller
   autoload :ShowHistory,    'eye/controller/show_history'
   autoload :Options,        'eye/controller/options'
 
-  include Eye::Logger::Helpers
   include Eye::Controller::Load
   include Eye::Controller::Helpers
   include Eye::Controller::Commands
@@ -37,12 +39,9 @@ class Eye::Controller
     @applications = []
     @current_config = Eye::Config.new
 
-    Eye.instance_variable_set(:@logger, Eye::Logger.new('eye'))
-    @logger = Eye.logger 
-    Celluloid::logger = Eye.logger
-
+    Celluloid::logger = Eye::Logger.new('celluloid')
     Eye::SystemResources.setup
-    
+
     info "starting #{Eye::ABOUT} (#{$$})"
   end
 
@@ -50,4 +49,8 @@ class Eye::Controller
     current_config.settings
   end
 
+  def logger_tag
+    'Eye'
+  end
+
 end

data/lib/eye/controller/commands.rb

@@ -6,8 +6,8 @@ module Eye::Controller::Commands
 
     start_at = Time.now
     cmd = cmd.to_sym
-    
-    res = case cmd 
+
+    res = case cmd
       when :start, :stop, :restart, :unmonitor, :monitor
         send_command(cmd, *args)
       when :delete
@@ -23,7 +23,7 @@ module Eye::Controller::Commands
       when :xinfo
         info_string_debug(*args)
       when :oinfo
-        info_string_short
+        info_string_short(*args)
       when :history
         history_string(*args)
       when :quit
@@ -47,22 +47,21 @@ module Eye::Controller::Commands
 
       else
         :unknown_command
-    end   
+    end
 
     GC.start
     info "client command: #{cmd} #{args * ', '} (#{Time.now - start_at}s)"
 
-    res  
+    res
   end
 
 private
 
   def quit
-    info 'exiting...'
+    info 'Quit!'
+    Eye::System.send_signal($$, :TERM)
     sleep 1
-    Eye::System.send_signal($$) # soft terminate
-    sleep 2
-    Eye::System.send_signal($$, 9)
+    Eye::System.send_signal($$, :KILL)
   end
 
 end

data/lib/eye/controller/helpers.rb

@@ -3,6 +3,7 @@ module Eye::Controller::Helpers
   def set_proc_line
     str = Eye::PROCLINE
     str += " (#{@applications.map(&:name) * ', '})" if @applications.present?
+    str += " [#{ENV['EYE_V']}]" if ENV['EYE_V']
     $0 = str
   end
 

data/lib/eye/controller/load.rb

@@ -8,7 +8,9 @@ module Eye::Controller::Load
     { filename => catch_load_error(filename) { parse_config(filename).to_h } }
   end
 
-  def load(*obj_strs)
+  def load(*args)
+    h = args.extract_options!
+    obj_strs = args.flatten
     info "load: #{obj_strs}"
 
     res = Hash.new
@@ -24,6 +26,8 @@ module Eye::Controller::Load
     set_proc_line
     save_cache
 
+    info "loaded: #{obj_strs}, selfpid <#{$$}>"
+
     res
   end
 
@@ -68,7 +72,7 @@ private
         sub << config_path
       end
       sub = [mask] if sub.empty?
-      
+
       res += sub
     end
 
@@ -76,7 +80,7 @@ private
   end
 
   # return: result, config
-  def parse_config(filename)    
+  def parse_config(filename)
     raise Eye::Dsl::Error, "config file '#{filename}' not found!" unless File.exists?(filename)
     debug "parse #{filename}"
 
@@ -90,7 +94,7 @@ private
     info "load #{filename}"
     new_cfg = @current_config.merge(config)
     new_cfg.validate!
-    
+
     load_options(new_cfg.settings)
     create_objects(new_cfg.applications, config.application_names)
     @current_config = new_cfg
@@ -150,7 +154,7 @@ private
       group.resort_processes
     end
 
-    # now, need to clear @old_groups, and @old_processes    
+    # now, need to clear @old_groups, and @old_processes
     @old_groups.each{|_, group| group.clear; group.send_command(:delete) }
     @old_processes.each{|_, process| process.send_command(:delete) if process.alive? }
 
@@ -159,7 +163,7 @@ private
     @added_groups.each do |group|
       if group.processes.size > 0 && (group.processes.pure - @added_processes).size == 0
         added_fully_groups << group
-        @added_processes -= group.processes.pure 
+        @added_processes -= group.processes.pure
       end
     end
 
@@ -205,7 +209,7 @@ private
       debug "update process #{process_name}"
       process = @old_processes.delete(process_name)
       process.schedule :update_config, process_cfg, Eye::Reason::User.new(:'load config')
-      process      
+      process
     else
       debug "create process #{process_name}"
       process = Eye::Process.new(process_cfg)

data/lib/eye/controller/send_command.rb

@@ -1,9 +1,9 @@
 module Eye::Controller::SendCommand
 
-  def send_command(command, *obj_strs)
-    matched_objects(*obj_strs) do |obj|
+  def send_command(command, *args)
+    matched_objects(*args) do |obj|
       if command.to_sym == :delete
-        remove_object_from_tree(obj) 
+        remove_object_from_tree(obj)
 
         set_proc_line
         save_cache
@@ -13,29 +13,39 @@ module Eye::Controller::SendCommand
     end
   end
 
-  def match(*obj_strs)
-    matched_objects(*obj_strs)
-  end  
+  def match(*args)
+    matched_objects(*args)
+  end
 
-  def signal(sig, *obj_strs)
-    matched_objects(*obj_strs) do |obj|
-      obj.send_command :signal, sig || 0
+  def signal(signal, *args)
+    matched_objects(*args) do |obj|
+      obj.send_command :signal, signal || 0
     end
   end
 
-  def break_chain(*obj_strs)
-    matched_objects(*obj_strs) do |obj|
+  def break_chain(*args)
+    matched_objects(*args) do |obj|
       obj.send_command(:break_chain)
     end
   end
 
 private
 
-  def matched_objects(*obj_strs, &block)
+  class Error < Exception; end
+
+  def matched_objects(*args, &block)
+    h = args.extract_options!
+    obj_strs = args
+
     objs = find_objects(*obj_strs)
     res = objs.map(&:full_name)
     objs.each{|obj| block[obj] } if block
-    res    
+    {:result => res}
+
+  rescue Error => ex
+    error ex.message
+
+    {:error => ex.message}
   end
 
   def remove_object_from_tree(obj)
@@ -54,17 +64,17 @@ private
     if klass == Eye::Process
       @applications.each{|app| app.groups.each{|gr| gr.processes.delete(obj) }}
       @current_config.delete_process(obj.name)
-    end    
+    end
   end
 
   # find object to action, restart ... (app, group or process)
   # nil if not found
   def find_objects(*obj_strs)
     return [] if obj_strs.blank?
-    return @applications.dup if obj_strs.size == 1 && (obj_strs[0].strip == 'all' || obj_strs[0].strip == '*')
+    return @applications.dup if obj_strs.size == 1 && (obj_strs[0].to_s.strip == 'all' || obj_strs[0].to_s.strip == '*')
 
     res = Eye::Utils::AliveArray.new
-    obj_strs.map{|c| c.split(",")}.flatten.each do |mask|
+    obj_strs.map{|c| c.to_s.split(",")}.flatten.each do |mask|
       res += find_objects_by_mask(mask.to_s.strip)
     end
     res
@@ -76,15 +86,16 @@ private
     if res.size > 1
       final = Eye::Utils::AliveArray.new
 
+      # try to find exactly matched
       if mask[-1] != '*'
-        # try to find exactly matched
         r = right_regexp(mask)
         res.each do |obj|
           final << obj if obj.full_name =~ r
         end
       end
 
-      return final if final.present?
+      res = final if final.present?
+      final = Eye::Utils::AliveArray.new
 
       # remove inherited targets
       res.each do |obj|
@@ -93,7 +104,21 @@ private
       end
 
       res = final
-    end    
+
+      # try to remove objects with different applications
+      fapps, apps = [], []
+      res.each do |obj|
+        if obj.is_a?(Eye::Application)
+          fapps << obj.name
+        else
+          apps << obj.app_name
+        end
+      end
+
+      if (apps).uniq.size > 1 || (fapps.size > 0 && (apps | fapps).size > fapps.size)
+        raise Error, "cant match targets from different applications: #{res.map(&:full_name)}"
+      end
+    end
 
     res
   end

data/lib/eye/controller/show_history.rb

@@ -1,7 +1,7 @@
 module Eye::Controller::ShowHistory
 
-  def history_string(*obj_strs)
-    data = history_data(*obj_strs)
+  def history_string(*args)
+    data = history_data(*args)
 
     res = []
     data.each do |name, data|
@@ -11,9 +11,9 @@ module Eye::Controller::ShowHistory
     res * "\n"
   end
 
-  def history_data(*obj_strs)
+  def history_data(*args)
     res = {}
-    get_processes_for_history(*obj_strs).each do |process|
+    get_processes_for_history(*args).each do |process|
       res[process.full_name] = process.schedule_history.reject{|c| c[:state] == :check_crash }
     end
     res
@@ -21,11 +21,12 @@ module Eye::Controller::ShowHistory
 
 private
 
-  def get_processes_for_history(*obj_strs)
+  def get_processes_for_history(*args)
+    args = ['*'] if args.empty?
     res = []
-    matched_objects(*obj_strs) do |obj| 
+    matched_objects(*args) do |obj|
       if (obj.is_a?(Eye::Process) || obj.is_a?(Eye::ChildProcess))
-        res << obj 
+        res << obj
       else
         res += obj.processes.to_a
       end

data/lib/eye/controller/status.rb

@@ -1,35 +1,23 @@
 module Eye::Controller::Status
 
-  def info_objects(mask = nil)
-    res = []
-    return @applications unless mask
-    matched_objects(mask){|obj| res << obj }    
-    res
-  end
-
-  def info_data(mask = nil)
-    {:subtree => info_objects(mask).map{|a| a.status_data } }
-  end
-
-  def info_data_debug(mask = nil)
-    {:subtree => info_objects(mask).map{|a| a.status_data(true) } }
+  def info_string(*args)
+    make_str(info_data(*args)).to_s
   end
 
-  def info_string(mask = nil)
-    make_str(info_data(mask)).to_s
-  end
-
-  def info_string_short
+  def info_string_short(*args)
     make_str({:subtree => @applications.map{|a| a.status_data_short } }).to_s
   end
 
-  def info_string_debug(show_config = false, show_processes = false)
-    actors = Celluloid::Actor.all.map{|actor| actor.instance_variable_get(:@klass) }.group_by{|a| a}.map{|k,v| [k, v.size]}.sort_by{|a|a[1]}.reverse
+  def info_string_debug(*args)
+    h = args.extract_options!
+    actors = Celluloid::Actor.all.map{|actor| actor.__klass__ }.group_by{|a| a}.map{|k,v| [k, v.size]}.sort_by{|a|a[1]}.reverse
 
     str = <<-S
 About:  #{Eye::ABOUT}
 Info:   #{resources_str(Eye::SystemResources.resources($$))}
 Ruby:   #{RUBY_DESCRIPTION}
+Gems:   #{%w|Celluloid Celluloid::IO ActiveSupport StateMachine NIO|.map{|c| gem_version(c) }}
+Checks: #{Eye::Checker::TYPES}, #{Eye::Trigger::TYPES}
 Logger: #{Eye::Logger.dev}
 Socket: #{Eye::Settings::socket_path}
 Pid:    #{Eye::Settings::pid_path}
@@ -37,9 +25,9 @@ Actors: #{actors.inspect}
 
     S
 
-    str += make_str(info_data_debug) + "\n" if show_processes.present?
+    str += make_str(info_data_debug) + "\n" if h[:processes].present?
 
-    if show_config.present?
+    if h[:config].present?
       str += "\nCurrent config: \n"
       str += YAML.dump(current_config.to_h)
     end
@@ -48,7 +36,22 @@ Actors: #{actors.inspect}
     str
   end
 
-private  
+  def info_data(*args)
+    {:subtree => info_objects(*args).map{|a| a.status_data } }
+  end
+
+private
+
+  def info_data_debug(*args)
+    {:subtree => info_objects(*args).map{|a| a.status_data(true) } }
+  end
+
+  def info_objects(*args)
+    res = []
+    return @applications if args.empty?
+    matched_objects(*args){|obj| res << obj }
+    res
+  end
 
   def make_str(data, level = -1)
     return nil if data.blank?
@@ -75,7 +78,7 @@ private
             str += " (chain: #{data[:debug][:chain].map(&:to_i)})"
           end
         elsif data[:state]
-          str += ' ' + data[:state].to_s 
+          str += ' ' + data[:state].to_s
           str += '  (' + resources_str(data[:resources]) + ')' if data[:resources].present? && data[:state].to_sym == :up
           str += " (#{data[:state_reason]} at #{data[:state_changed_at].to_s(:short)})" if data[:state_reason] && data[:state] == 'unmonitored'
         elsif data[:current_command]
@@ -100,11 +103,11 @@ private
 
   def resources_str(r)
     return '' if r.blank?
-    
+
     res = "#{r[:start_time]}, #{r[:cpu]}%"
     res += ", #{r[:memory] / 1024}Mb" if r[:memory]
     res += ", <#{r[:pid]}>"
-    
+
     res
   end
 
@@ -123,4 +126,14 @@ private
     apps
   end
 
+  def gem_version(klass)
+    v = nil
+    begin
+      v = eval("#{klass}::VERSION::STRING")
+    rescue
+      v = eval("#{klass}::VERSION") rescue ''
+    end
+    "#{klass}=#{v}"
+  end
+
 end