eye 0.8.celluloid15 → 0.8.pre

data/lib/eye/checker/ssl_socket.rb

@@ -1,16 +1,17 @@
 require 'openssl'
 
 class Eye::Checker::SslSocket < Eye::Checker::Socket
+  param :ctx,          Hash, nil, {ssl_version: :SSLv23, verify_mode: OpenSSL::SSL::VERIFY_NONE}
 
-  # ctx params from http://ruby-doc.org/stdlib-1.9.3/libdoc/openssl/rdoc/OpenSSL/SSL/SSLContext.html
+  # other params inherits from socket check
   #
   # examples:
   #
   #   check :ssl_socket, :addr => "tcp://127.0.0.1:443", :every => 5.seconds, :times => 1, :timeout => 1.second,
   #     :ctx => {ssl_version: :SSLv23, verify_mode: OpenSSL::SSL::VERIFY_NONE}
   #
-
-  param :ctx, Hash, nil, ssl_version: :SSLv23, verify_mode: OpenSSL::SSL::VERIFY_NONE
+  #
+  #  ctx_params from http://ruby-doc.org/stdlib-1.9.3/libdoc/openssl/rdoc/OpenSSL/SSL/SSLContext.html
 
 private
 
@@ -22,7 +23,6 @@ private
   end
 
   def ctx_params
-    @ctx_params ||= OpenSSL::SSL::SSLContext.new.tap { |c| c.set_params(ctx) }
+    @ctx_params ||= OpenSSL::SSL::SSLContext.new().tap { |c| c.set_params(ctx) }
   end
-
 end

data/lib/eye/child_process.rb

@@ -1,7 +1,6 @@
 require 'celluloid'
 
 class Eye::ChildProcess
-
   include Celluloid
 
   # needs: kill_process
@@ -34,7 +33,7 @@ class Eye::ChildProcess
     @parent = parent
     @config = prepare_config(config)
     @name = "child-#{pid}"
-    @full_name = [logger_prefix, @name].join(':')
+    @full_name = [logger_prefix, @name] * ':'
 
     @watchers = {}
 
@@ -89,15 +88,14 @@ class Eye::ChildProcess
   end
 
   def signal(sig)
-    send_signal(sig) if pid
+    send_signal(sig) if self.pid
   end
 
-  def status_data(opts = {})
-    self_status_data(opts)
+  def status_data(debug = false)
+    self_status_data(debug)
   end
 
   def prepare_command(command) # override
     super.gsub('{PARENT_PID}', @parent.pid.to_s)
   end
-
 end

data/lib/eye/cli.rb

@@ -4,7 +4,6 @@ gem 'thor'
 require 'thor'
 
 class Eye::Cli < Thor
-
   autoload :Server,     'eye/cli/server'
   autoload :Commands,   'eye/cli/commands'
   autoload :Render,     'eye/cli/render'
@@ -13,27 +12,24 @@ class Eye::Cli < Thor
   include Eye::Cli::Commands
   include Eye::Cli::Render
 
-  desc 'info [MASK]', 'processes info'
-  method_option :json, type: :boolean, aliases: '-j'
-  method_option :procline, type: :boolean, aliases: '-p'
+  desc "info [MASK]", "processes info"
+  method_option :json, :type => :boolean, :aliases => "-j"
   def info(mask = nil)
-    h = {}
-    h[:procline] = true if options[:procline]
-
-    res = cmd(:info_data, *Array(mask), h)
+    res = cmd(:info_data, *Array(mask))
     if mask && res[:subtree] && res[:subtree].empty?
-      error!('command :info, objects not found!')
+      error!("command :info, objects not found!")
     end
 
     if options[:json]
-      say_json(res)
+      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'
+  desc "status NAME", "return exit status for process name 0-up, 3-unmonitored"
   def status(name)
     res = cmd(:info_data, *Array(name))
     es, msg = render_status(res)
@@ -41,58 +37,43 @@ class Eye::Cli < Thor
     exit(es)
   end
 
-  desc 'xinfo', 'eye-deamon info (-c show current config)'
-  method_option :config, type: :boolean, aliases: '-c'
-  method_option :json, type: :boolean, aliases: '-j'
+  desc "xinfo", "eye-deamon info (-c show current config)"
+  method_option :config, :type => :boolean, :aliases => "-c"
   def xinfo
-    res = cmd(:debug_data, config: options[:config])
-    if options[:json]
-      say_json(res)
-    else
-      say render_debug_info(res)
-      say
-    end
+    res = cmd(:debug_data, :config => options[:config])
+    say render_debug_info(res)
+    say
   end
 
-  desc 'oinfo', 'onelined info'
-  method_option :json, type: :boolean, aliases: '-j'
+  desc "oinfo", "onelined info"
   def oinfo(mask = nil)
     res = cmd(:short_data, *Array(mask))
-    if options[:json]
-      say_json(res)
-    else
-      say render_info(res)
-      say
-    end
+    say render_info(res)
+    say
   end
 
-  desc 'history [MASK,...]', 'processes history'
-  method_option :json, type: :boolean, aliases: '-j'
+  desc "history [MASK,...]", "processes history"
   def history(*masks)
     res = cmd(:history_data, *masks)
     if !masks.empty? && res && res.empty?
-      error!('command :history, objects not found!')
-    end
-    if options[:json]
-      say_json(res)
-    else
-      say render_history(res)
-      say
+      error!("command :history, objects not found!")
     end
+    say render_history(res)
+    say
   end
 
-  desc 'load [CONF, ...]', 'load config (run eye-daemon if not) (-f foreground load)'
-  method_option :foreground, type: :boolean, aliases: '-f'
+  desc "load [CONF, ...]", "load config (run eye-daemon if not) (-f foreground load)"
+  method_option :foreground, :type => :boolean, :aliases => "-f"
   def load(*configs)
-    configs.map! { |c| File.expand_path(c) }
+    configs.map!{ |c| File.expand_path(c) } if !configs.empty?
 
     if options[:foreground]
       # in foreground we stop another server, and run just 1 current config version
-      error!('foreground expected only one config') if configs.size > 1
+      error!("foreground expected only one config") if configs.size > 1
       server_start_foreground(configs.first)
 
     elsif server_started?
-      configs << Eye::Local.eyefile if Eye::Local.local_runner && configs.empty? && Eye::Local.eyefile
+      configs << Eye::Local.eyefile if Eye::Local.local_runner
       say_load_result cmd(:load, *configs)
 
     else
@@ -101,9 +82,9 @@ class Eye::Cli < Thor
     end
   end
 
-  desc 'quit', 'eye-daemon quit'
-  method_option :stop_all, type: :boolean, aliases: '-s'
-  method_option :timeout, type: :string, aliases: '-t', default: '600'
+  desc "quit", "eye-daemon quit"
+  method_option :stop_all, :type => :boolean, :aliases => "-s"
+  method_option :timeout, :type => :string, :aliases => "-t", :default => "600"
   def quit
     if options[:stop_all]
       Eye::Local.client_timeout = options[:timeout].to_i
@@ -119,7 +100,7 @@ class Eye::Cli < Thor
     # remove pid_file
     File.delete(Eye::Local.pid_path) if File.exist?(Eye::Local.pid_path)
 
-    say "Eye quit ಠ╭╮ಠ (#{Eye::Local.home})", :yellow
+    say "Quit ಠ╭╮ಠ", :yellow
   end
 
   [:start, :stop, :restart, :unmonitor, :monitor, :delete, :match].each do |command|
@@ -129,61 +110,60 @@ class Eye::Cli < Thor
     end
   end
 
-  desc 'force_restart MASK[,...]', 'restart by stop;start (not by restart_command)'
+  desc "force_restart MASK[,...]", "restart by stop;start (not by restart_command)"
   def force_restart(*masks)
     send_command(:stop, *masks)
     send_command(:start, *masks)
   end
 
-  desc 'signal SIG MASK[,...]', 'send signal to app,group or process'
+  desc "signal SIG MASK[,...]", "send signal to app,group or process"
   def signal(sig, *masks)
     send_command(:signal, sig, *masks)
   end
 
-  desc 'break MASK[,...]', 'break chain executing'
+  desc "break MASK[,...]", "break chain executing"
   def break(*masks)
     send_command(:break_chain, *masks)
   end
 
-  desc 'trace [MASK]', 'tracing log(tail + grep) for app,group or process'
-  def trace(mask = '')
+  desc "trace [MASK]", "tracing log(tail + grep) for app,group or process"
+  def trace(mask = "")
     log_trace(mask)
   end
 
-  map ['-v', '--version'] => :version
-  desc 'version', 'version'
+  map ["-v", "--version"] => :version
+  desc "version", "version"
   def version
     say Eye::ABOUT
   end
 
-  desc 'check CONF', 'check config file syntax'
-  method_option :host, type: :string, aliases: '-h'
-  method_option :verbose, type: :boolean, aliases: '-v'
+  desc "check CONF", "check config file syntax"
+  method_option :host, :type => :string, :aliases => "-h"
+  method_option :verbose, :type => :boolean, :aliases => "-v"
   def check(conf)
     conf = File.expand_path(conf) if conf && !conf.empty?
 
     Eye::Local.host = options[:host] if options[:host]
     Eye::Dsl.verbose = options[:verbose]
 
-    say_load_result Eye::Controller.new.check(conf), syntax: true
+    say_load_result Eye::Controller.new.check(conf), :syntax => true
   end
 
-  desc 'explain CONF', 'explain config tree'
-  method_option :host, type: :string, aliases: '-h'
-  method_option :verbose, type: :boolean, aliases: '-v'
+  desc "explain CONF", "explain config tree"
+  method_option :host, :type => :string, :aliases => "-h"
+  method_option :verbose, :type => :boolean, :aliases => "-v"
   def explain(conf)
     conf = File.expand_path(conf) if conf && !conf.empty?
 
     Eye::Local.host = options[:host] if options[:host]
     Eye::Dsl.verbose = options[:verbose]
 
-    say_load_result Eye::Controller.new.explain(conf), print_config: true, syntax: true
+    say_load_result Eye::Controller.new.explain(conf), :print_config => true, :syntax => true
   end
 
-  desc 'watch [MASK]', 'interactive processes info'
-  method_option :procline, type: :boolean, aliases: '-p'
+  desc "watch [MASK]", "interactive processes info"
   def watch(*args)
-    error!('You should install watch utility') if `which watch`.empty?
+    error!("You should install watch utility") if `which watch`.empty?
 
     cmd = if `watch --version 2>&1`.chop > '0.2.0'
       "watch -n 1 --color #{$0} i #{args * ' '}"
@@ -191,14 +171,12 @@ class Eye::Cli < Thor
       "watch -n 1 #{$0} i #{args * ' '}"
     end
 
-    cmd += ' -p' if options[:procline]
-
     pid = Process.spawn(cmd)
     Process.waitpid(pid)
   rescue Interrupt
   end
 
-  desc 'user_command CMD [MASK]', 'execute user_command (dsl command)'
+  desc "user_command CMD [MASK]", "execute user_command (dsl command)"
   def user_command(cmd, *args)
     send_command(:user_command, cmd, *args)
   end
@@ -224,13 +202,7 @@ private
     end
   end
 
-  def say_json(obj)
-    require 'json'
-    say JSON.dump(obj)
-  end
-
   def self.exit_on_failure?
     true
   end
-
 end

data/lib/eye/cli/commands.rb

@@ -1,5 +1,4 @@
 module Eye::Cli::Commands
-
 private
 
   def client
@@ -40,10 +39,12 @@ private
   def show_load_message(res, opts = {})
     if res[:error]
       say res[:message], :red
-      res[:backtrace].to_a.each { |line| say line, :red }
+      res[:backtrace].to_a.each{|line| say line, :red }
     else
-      unless res[:empty]
-        say(opts[:syntax] ? 'Config ok!' : 'Config loaded!', :green)
+      if opts[:syntax]
+        say 'Config ok!', :green if !res[:empty]
+      else
+        say 'Config loaded!', :green if !res[:empty]
       end
 
       if opts[:print_config]

data/lib/eye/cli/render.rb

@@ -1,11 +1,9 @@
 module Eye::Cli::Render
-
 private
-
   def render_status(data)
     return [1, "unexpected server response #{data.inspect}"] unless data.is_a?(Hash)
     data = data[:subtree]
-    return [1, "match #{data.size} objects (#{data.map { |d| d[:name] }}), but expected only 1 process"] if data.size != 1
+    return [1, "match #{data.size} objects (#{data.map{|d| d[:name]}}), but expected only 1 process"] if data.size != 1
     process = data[0]
     return [1, "unknown status for :#{process[:type]}=#{process[:name]}"] unless process[:type] == :process
 
@@ -26,14 +24,37 @@ private
     return nil if !data || data.empty?
 
     if data.is_a?(Array)
-      data.map { |el| make_str(el, level) }.compact * "\n"
+      data.map{|el| make_str(el, level) }.compact * "\n"
     else
       str = nil
 
       if data[:name]
         return make_str(data[:subtree], level) if data[:name] == '__default__'
 
-        str = render_element(data, level)
+        off = level * 2
+        off_str = ' ' * off
+
+        short_state = ((data[:type] == :application || data[:type] == :group) && data[:states])
+        is_text = data[:state] || data[:states]
+
+        name = (data[:type] == :application && !is_text) ? "\033[1m#{data[:name]}\033[0m" : data[:name].to_s
+        off_len = 35
+        str = off_str + (name + ' ').ljust(off_len - off, is_text ? '.' : ' ')
+
+        if short_state
+          str += ' ' + data[:states].map { |k, v| "#{k}:#{v}" }.join(', ')
+        elsif data[:state]
+          str += ' ' + data[:state].to_s
+          str += '  (' + resources_str(data[:resources]) + ')' if data[:resources] && data[:state].to_sym == :up
+          str += " (#{data[:state_reason]} at #{Eye::Utils.human_time2(data[:state_changed_at])})" if data[:state_reason] && data[:state] == 'unmonitored'
+        elsif data[:current_command]
+          chain_progress = if data[:chain_progress]
+            " #{data[:chain_progress][0]} of #{data[:chain_progress][1]}" rescue ''
+          end
+          str += " \e[1;33m[#{data[:current_command]}#{chain_progress}]\033[0m"
+          str += " (#{data[:chain_commands] * ', '})" if data[:chain_commands]
+        end
+
       end
 
       if data[:subtree].nil?
@@ -46,10 +67,18 @@ private
     end
   end
 
+  def resources_str(r)
+    return '' if !r || r.empty?
+    memory, cpu, start_time, pid = r[:memory], r[:cpu], r[:start_time], r[:pid]
+    return '' unless memory && cpu && start_time
+
+    "#{Eye::Utils.human_time(start_time)}, #{cpu.to_i}%, #{memory / 1024 / 1024}Mb, <#{pid}>"
+  end
+
   def render_debug_info(data)
     error!("unexpected server response #{data.inspect}") unless data.is_a?(Hash)
 
-    s = ''
+    s = ""
 
     if config_yaml = data.delete(:config_yaml)
       s << config_yaml
@@ -59,10 +88,10 @@ private
         s << "#{"#{k}:".ljust(10)} "
 
         case k
-          when :resources
-            s << resources_str(v)
-          else
-            s << "#{v}"
+        when :resources
+          s << resources_str(v)
+        else
+          s << "#{v}"
         end
 
         s << "\n"
@@ -85,10 +114,10 @@ private
     res = "\033[1m#{name}\033[0m\n"
     history = history.reverse
 
-    history.chunk { |h| [h[:state], h[:reason].to_s] }.each do |_, hist|
+    history.chunk{|h| [h[:state], h[:reason].to_s] }.each do |_, hist|
       if hist.size >= 3
         res << detail_process_info_string(hist[0])
-        res << detail_process_info_string(state: "... #{hist.size - 2} times", reason: '...')
+        res << detail_process_info_string(:state => "... #{hist.size - 2} times", :reason => '...')
         res << detail_process_info_string(hist[-1])
       else
         hist.each do |h|
@@ -106,53 +135,4 @@ private
     "#{at} - #{state} (#{h[:reason]})\n"
   end
 
-private
-
-  def render_element(data, level)
-    off = level * 2
-    off_str = ' ' * off
-
-    short_state = (data[:type] == :application || data[:type] == :group) && data[:states]
-    is_text = data[:state] || data[:states]
-
-    name = (data[:type] == :application && !is_text) ? "\033[1m#{data[:name]}\033[0m" : data[:name].to_s
-    off_len = 35
-    str = off_str + (name + ' ').ljust(off_len - off, is_text ? '.' : ' ')
-
-    if short_state
-      str += ' ' + data[:states].map { |k, v| "#{k}:#{v}" }.join(', ')
-    elsif data[:state]
-      str += ' ' + data[:state].to_s
-      if data[:resources] && data[:state].to_sym == :up
-        str += '  (' + resources_str(data[:resources])
-        str += ", <#{data[:procline]}>" if data[:procline]
-        str += ')'
-      end
-      if data[:state_reason] && data[:state] == 'unmonitored'
-        str += " (#{data[:state_reason]} at #{Eye::Utils.human_time2(data[:state_changed_at])})"
-      end
-    elsif data[:current_command]
-      chain_progress = if data[:chain_progress]
-        " #{data[:chain_progress][0]} of #{data[:chain_progress][1]}" rescue ''
-      end
-      str += " \e[1;33m[#{data[:current_command]}#{chain_progress}]\033[0m"
-      str += " (#{data[:chain_commands] * ', '})" if data[:chain_commands]
-    end
-
-    str
-  end
-
-  def resources_str(r)
-    return '' if !r || r.empty?
-
-    memory = r[:memory]
-    cpu = r[:cpu]
-    start_time = r[:start_time]
-    pid = r[:pid]
-
-    return '' unless memory && cpu && start_time
-
-    "#{Eye::Utils.human_time(start_time)}, #{cpu.to_i}%, #{memory / 1024 / 1024}Mb, <#{pid}>"
-  end
-
 end