reel-eye 0.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cef15d8559f95d22d04f0b423ee81bcd9b10ef2
-  data.tar.gz: c5f01498bb84e011b02d05fc2146ea880a7524ae
+  metadata.gz: a4e0a9547f32b0eae31d793656a43b559eaa2df7
+  data.tar.gz: a2a6fa219d1b8d4f904075013ba61466cc32a881
 SHA512:
-  metadata.gz: ae2991e43e2413b5897ce17bf72fcd10bbfb651b83501709134efff06c1120ee38eac8df2bdebc0c1ba9a6cccf1cd60f866e931d369bedd2853fd30ddcacc38c
-  data.tar.gz: 6ecfa8784c8363d7c62f694dd4f157c23f29a3bbb5274c3055e4b0847e5d4512746fafc342d726e59ff42731783bf3911734c8de2cbf872aa98daafebbe505b4
+  metadata.gz: 8b252fa537587c2678c9b3f85af63bbb2796ac1bac895c6ff8a1954847612f4c2cf4968fb72664439a584bcbef6701f1a7f8ed26b4cc631c2f4b48da44ca74aa
+  data.tar.gz: 737744391f0de8816aef5728d52f05649b48bb377c8b5c89808d98b3a2dc06f52cbf3296efdd2834a508f572efc8e247de8ac639ed74adb4812d1f82b7b43610

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 rvm:
   - "1.9.2"
   - "1.9.3"
-  - "2.0"
+  - "2.0.0"
+  - "2.1.0"
 script: bundle exec rake N=15
 #before_script:
 #  - bundle exec rake remove_coverage

data/CHANGES.md

@@ -1,10 +1,16 @@
+0.5.1
+-----
+* fix ordering in info (#27)
+* add log rotation (#26)
+* minor load fixes
+
 0.5
 -------
 * little fixes in dsl
 * remove activesupport dependency
 * rename `state` trigger to `transition`
 * add runtime, cputime, file_touched checks
-* real cpu check
+* real cpu check (#9)
 * use sigar gem instead of `ps ax`
 * refactor cli (requires `eye q && eye l` after update gem from 0.4.x)
 * update celluloid to 0.15

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013 'Konstantin Makarchev'
+Copyright (c) 2012-2014 'Konstantin Makarchev'
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/loader_eye

@@ -53,6 +53,7 @@ Eye::Control.set_proc_line
 server.async.run
 
 trap("INT"){ exit }
+trap("USR1"){ Eye::Logger.reopen }
 trap("USR2"){ GC.start }
 
 sleep

data/eye.gemspec

@@ -40,5 +40,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'thin'
   gem.add_development_dependency 'xmpp4r'
   gem.add_development_dependency 'coveralls'
+  gem.add_development_dependency 'simplecov', '>= 0.8.1'
   gem.add_development_dependency 'parallel_tests'
 end

data/lib/eye.rb

@@ -1,6 +1,6 @@
 module Eye
-  VERSION   = "0.5"
-  ABOUT     = "ReelEye v#{VERSION} (c) 2012-2013 @kostya"
+  VERSION   = "0.5.1"
+  ABOUT     = "ReelEye v#{VERSION} (c) 2012-2014 @kostya"
   PROCLINE  = "reel-eye monitoring v#{VERSION}"
 
   autoload :Process,        'eye/process'

data/lib/eye/application.rb

@@ -23,7 +23,7 @@ class Eye::Application
 
   # sort processes in name order
   def resort_groups
-    @groups = @groups.sort_by{|gr| gr.name == '__default__' ? 'zzzzz' : gr.name }
+    @groups = @groups.sort { |a, b| a.hidden ? 1 : (b.hidden ? -1 : (a.name <=> b.name)) }
   end
 
   def status_data(debug = false)

data/lib/eye/cli.rb

@@ -32,8 +32,8 @@ class Eye::Cli < Thor
   end
 
   desc "oinfo", "onelined info"
-  def oinfo
-    res = cmd(:short_data)
+  def oinfo(mask = nil)
+    res = cmd(:short_data, *Array(mask))
     say render_info(res)
     say
   end
@@ -45,7 +45,7 @@ class Eye::Cli < Thor
     say
   end
 
-  desc "load [CONF, ...]", "load config (start eye-daemon if not) (-f foreground start)"
+  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) } if !configs.empty?
@@ -111,7 +111,7 @@ class Eye::Cli < Thor
   def check(conf)
     conf = File.expand_path(conf) if conf && !conf.empty?
 
-    Eye::System.host = options[:host] if options[:host]
+    Eye::Local.host = options[:host] if options[:host]
     Eye::Dsl.verbose = options[:verbose]
 
     say_load_result Eye::Controller.new.check(conf), :syntax => true
@@ -123,7 +123,7 @@ class Eye::Cli < Thor
   def explain(conf)
     conf = File.expand_path(conf) if conf && !conf.empty?
 
-    Eye::System.host = options[:host] if options[:host]
+    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
@@ -131,6 +131,8 @@ class Eye::Cli < Thor
 
   desc "watch [MASK]", "interactive processes info"
   def watch(*args)
+    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 * ' '}"
     else

data/lib/eye/cli/commands.rb

@@ -68,7 +68,7 @@ private
         if res == []
           error! "command :#{_cmd}, objects not found!"
         else
-          say "command :#{_cmd} sended to [#{res * ", "}]"
+          say "command :#{_cmd} sent to [#{res * ", "}]"
         end
       end
     else

data/lib/eye/cli/render.rb

@@ -1,7 +1,5 @@
 module Eye::Cli::Render
 private
-  DF = '%d %b %H:%M'
-
   def render_info(data)
     error!("unexpected server answer #{data.inspect}") unless data.is_a?(Hash)
 
@@ -26,7 +24,7 @@ private
         is_text = data[:state] || data[:states]
 
         name = (data[:type] == :application && !is_text) ? "\033[1m#{data[:name]}\033[0m" : data[:name].to_s
-        off_len = short_state ? 20 : 35
+        off_len = 35
         str = off_str + (name + ' ').ljust(off_len - off, is_text ? '.' : ' ')
 
         if short_state
@@ -34,7 +32,7 @@ private
         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 #{data[:state_changed_at].strftime(DF)})" if data[:state_reason] && data[:state] == 'unmonitored'
+          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 ''
@@ -60,11 +58,7 @@ private
     memory, cpu, start_time, pid = r[:memory], r[:cpu], r[:start_time], r[:pid]
     return '' unless memory && cpu && start_time
 
-    res = "#{Eye::Utils.human_time(start_time)}, #{cpu.to_i}%"
-    res += ", #{memory / 1024 / 1024}Mb"
-    res += ", <#{pid}>"
-
-    res
+    "#{Eye::Utils.human_time(start_time)}, #{cpu.to_i}%, #{memory / 1024 / 1024}Mb, <#{pid}>"
   end
 
   def render_debug_info(data)
@@ -72,28 +66,26 @@ private
 
     s = ""
 
-    config_yaml = data.delete(:config_yaml)
+    if config_yaml = data.delete(:config_yaml)
+      s << config_yaml
 
-    data.each do |k, v|
-      s << "#{"#{k}:".ljust(10)} "
+    else
+      data.each do |k, v|
+        s << "#{"#{k}:".ljust(10)} "
+
+        case k
+        when :resources
+          s << resources_str(v)
+        else
+          s << "#{v}"
+        end
 
-      case k
-      when :resources
-        s << resources_str(v)
-      else
-        s << "#{v}"
+        s << "\n"
       end
 
       s << "\n"
     end
 
-    s << "\n"
-
-    if config_yaml
-      s << "Current config:\n"
-      s << config_yaml
-    end
-
     s
   end
 
@@ -117,7 +109,7 @@ private
     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 => '...', :at => hist[-1][:at])
+        res << detail_process_info_string(:state => "... #{hist.size - 2} times", :reason => '...')
         res << detail_process_info_string(hist[-1])
       else
         hist.each do |h|
@@ -131,7 +123,8 @@ private
 
   def detail_process_info_string(h)
     state = h[:state].to_s.ljust(14)
-    "#{Time.at(h[:at]).strftime(DF)} - #{state} (#{h[:reason]})\n"
+    at = h[:at] ? Eye::Utils.human_time2(h[:at]) : '.' * 12
+    "#{at} - #{state} (#{h[:reason]})\n"
   end
 
 end

data/lib/eye/controller/load.rb

@@ -125,13 +125,13 @@ private
     @old_groups = {}
     @old_processes = {}
 
-    app = @applications.detect{|c| c.name == app_name}
+    app = @applications.detect { |c| c.name == app_name }
 
     if app
       app.groups.each do |group|
         @old_groups[group.name] = group
         group.processes.each do |proc|
-          @old_processes[proc.name] = proc
+          @old_processes[group.name + ":" + proc.name] = proc
         end
       end
 
@@ -204,13 +204,17 @@ private
   end
 
   def update_or_create_process(process_name, process_cfg)
-    if @old_processes[process_name]
-      debug "update process #{process_name}"
-      process = @old_processes.delete(process_name)
+    postfix = ":" + process_name
+    name = process_cfg[:group] + postfix
+    key = @old_processes[name] ? name : @old_processes.keys.detect { |n| n.end_with?(postfix) }
+
+    if @old_processes[key]
+      debug "update process #{name}"
+      process = @old_processes.delete(key)
       process.schedule :update_config, process_cfg, Eye::Reason::User.new(:'load config')
       process
     else
-      debug "create process #{process_name}"
+      debug "create process #{name}"
       process = Eye::Process.new(process_cfg)
       @added_processes << process
       process

data/lib/eye/controller/options.rb

@@ -1,13 +1,9 @@
 module Eye::Controller::Options
 
-  def set_opt_logger(logger)
+  def set_opt_logger(logger_args)
     # do not apply logger, if in stdout state
     if !%w{stdout stderr}.include?(Eye::Logger.dev)
-      if logger.blank?
-        Eye::Logger.link_logger(nil)
-      else
-        Eye::Logger.link_logger(logger)
-      end
+      Eye::Logger.link_logger(*logger_args)
     end
   end
 

data/lib/eye/controller/status.rb

@@ -10,8 +10,9 @@ module Eye::Controller::Status
       :ruby => RUBY_DESCRIPTION,
       :http => @http ? "#{@http.host}:#{@http.port}" : '-',
       :gems => %w|Celluloid Celluloid::IO StateMachine NIO Sigar|.map{|c| gem_version(c) },
-      :logger => Eye::Logger.dev,
+      :logger => Eye::Logger.args.present? ? [Eye::Logger.dev, *Eye::Logger.args] : Eye::Logger.dev,
       :pid_path => Eye::Local::pid_path,
+      :sock_path => Eye::Local::socket_path,
       :actors => actors
     }
 
@@ -25,7 +26,7 @@ module Eye::Controller::Status
   end
 
   def short_data(*args)
-    {:subtree => @applications.map{|a| a.status_data_short } }
+    {:subtree => info_objects(*args).select{ |o| o.class == Eye::Application }.map{|a| a.status_data_short } }
   end
 
   def history_data(*args)

data/lib/eye/dsl.rb

@@ -41,6 +41,10 @@ class Eye::Dsl
     def parse_apps(*args)
       parse(*args).applications
     end
+
+    def check_name(name)
+      raise Error, "not allow ':' in name '#{name}'" if name.to_s.include?(':')
+    end
   end
 end
 

data/lib/eye/dsl/application_opts.rb

@@ -11,6 +11,7 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
   end
 
   def group(name, &block)
+    Eye::Dsl.check_name(name)
     Eye::Dsl.debug "=> group #{name}"
 
     opts = Eye::Dsl::GroupOpts.new(name, self)

data/lib/eye/dsl/config_opts.rb

@@ -1,12 +1,18 @@
 class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
 
-  create_options_methods([:logger], String)
   create_options_methods([:logger_level], Fixnum)
   create_options_methods([:http], Hash)
 
-  def set_logger(logger)
-    logger.blank? ? super('') : super
+  def logger(*args)
+    if args.empty?
+      @config[:logger]
+    else
+      str = args[0]
+      raise Eye::Dsl::Error, "logger should be a String #{str.inspect}" if !(str.is_a?(String) || str == nil)
+      @config[:logger] = args
+    end
   end
+  alias logger= logger
 
   # ==== contact options ==============================
   def self.add_notify(type)

data/lib/eye/dsl/group_opts.rb

@@ -11,6 +11,8 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
   end
 
   def process(name, &block)
+    Eye::Dsl.check_name(name)
+
     Eye::Dsl.debug "=> process #{name}"
 
     opts = Eye::Dsl::ProcessOpts.new(name, self)

data/lib/eye/dsl/helpers.rb

@@ -8,5 +8,5 @@ end
 
 # host name
 def hostname
-  Eye::System.host
+  Eye::Local.host
 end

data/lib/eye/dsl/main.rb

@@ -2,6 +2,8 @@ module Eye::Dsl::Main
   attr_accessor :parsed_config, :parsed_filename
 
   def application(name, &block)
+    Eye::Dsl.check_name(name)
+
     Eye::Dsl.debug "=> app: #{name}"
     opts = Eye::Dsl::ApplicationOpts.new(name)
     opts.instance_eval(&block)

data/lib/eye/dsl/opts.rb

@@ -1,6 +1,6 @@
 class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
-  STR_OPTIONS = [ :pid_file, :working_dir, :stdout, :stderr, :stdall, :start_command,
+  STR_OPTIONS = [ :pid_file, :working_dir, :stdout, :stderr, :stdall, :stdin, :start_command,
     :stop_command, :restart_command, :uid, :gid ]
   create_options_methods(STR_OPTIONS, String)
 
@@ -107,6 +107,10 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     super
   end
 
+  def daemonize!
+    set_daemonize true
+  end
+
   def scoped(&block)
     h = self.class.new(self.name, self)
     h.instance_eval(&block)
@@ -139,7 +143,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     on_server = true
 
     if glob.present?
-      host = Eye::System.host
+      host = Eye::Local.host
 
       if glob.is_a?(Array)
         on_server = !!glob.any?{|elem| elem == host}

data/lib/eye/local.rb

@@ -24,7 +24,9 @@ module Eye::Local
   end
 
   def home
-    ENV['EYE_HOME'] || ENV['HOME']
+    h = ENV['EYE_HOME'] || ENV['HOME']
+    raise "HOME undefined, should be HOME or EYE_HOME environment" unless h
+    h
   end
 
   def path(path)
@@ -55,4 +57,15 @@ module Eye::Local
     RUBY_VERSION >= '2.0'
   end
 
+  def host
+    @host ||= begin
+      require 'socket'
+      Socket.gethostname
+    end
+  end
+
+  def host=(hostname)
+    @host = hostname
+  end
+
 end

data/lib/eye/logger.rb

@@ -53,17 +53,18 @@ class Eye::Logger
   end
 
   class << self
-    attr_reader :dev, :log_level
+    attr_reader :dev, :log_level, :args
 
-    def link_logger(dev)
+    def link_logger(dev, *args)
       old_dev = @dev
       @dev = dev ? dev.to_s : nil
       @dev_fd = @dev
+      @args = args
 
       @dev_fd = STDOUT if @dev.to_s.downcase == 'stdout'
       @dev_fd = STDERR if @dev.to_s.downcase == 'stderr'
 
-      @inner_logger = InnerLogger.new(@dev_fd)
+      @inner_logger = InnerLogger.new(@dev_fd, *args)
       @inner_logger.level = self.log_level || Logger::INFO
 
     rescue Errno::ENOENT, Errno::EACCES
@@ -71,6 +72,10 @@ class Eye::Logger
       raise
     end
 
+    def reopen
+      link_logger(dev, *args)
+    end
+
     def log_level=(level)
       @log_level = level
       @inner_logger.level = self.log_level if @inner_logger

data/lib/eye/notify.rb

@@ -84,7 +84,7 @@ class Eye::Notify
   end
 
   def message_body
-    "#{message_subject} at #{msg_at.strftime(Eye::Cli::Render::DF)}"
+    "#{message_subject} at #{Eye::Utils.human_time2(msg_at)}"
   end
 
   def self.register(base)

data/lib/eye/process/data.rb

@@ -35,7 +35,7 @@ module Eye::Process::Data
           resources: Eye::SystemResources.resources(pid) }
 
     if @states_history
-      h.merge!( state_changed_at: @states_history.last_state_changed_at,
+      h.merge!( state_changed_at: @states_history.last_state_changed_at.to_i,
                 state_reason: @states_history.last_reason )
     end
 

data/lib/eye/process/notify.rb

@@ -14,7 +14,7 @@ module Eye::Process::Notify
     # send notifies
     if self[:notify].present?
       message = {:message => msg, :name => name,
-        :full_name => full_name, :pid => pid, :host => Eye::System.host, :level => level,
+        :full_name => full_name, :pid => pid, :host => Eye::Local.host, :level => level,
         :at => Time.now }
 
       self[:notify].each do |contact, not_level|

data/lib/eye/system.rb

@@ -98,45 +98,13 @@ module Eye::System
       Process.detach(pid) if pid
     end
 
-    # get table
-    # {pid => {:rss =>, :cpu =>, :ppid => , :start_time => }}
-    # slow
-    def ps_aux
-      str = Process.send('`', PS_AUX_CMD).force_encoding('binary')
-      h = {}
-      str.each_line do |line|
-        chunk = line.strip.split(/\s+/)
-        h[chunk[0].to_i] = { :ppid => chunk[1].to_i, :cpu => chunk[2].to_i,
-          :rss => chunk[3].to_i, :start_time => chunk[4] }
-      end
-      h
-    end
-
     # normalize file
     def normalized_file(file, working_dir = nil)
       Pathname.new(file).expand_path(working_dir).to_s
     end
 
-    def host
-      @host ||= begin
-        require 'socket'
-        Socket.gethostname
-      end
-    end
-
-    # set host for tests
-    def host=(hostname)
-      @host = hostname
-    end
-
   private
 
-    PS_AUX_CMD = if RUBY_PLATFORM.include?('darwin')
-      'ps axo pid,ppid,pcpu,rss,start'
-    else
-      'ps axo pid,ppid,pcpu,rss,start_time'
-    end
-
     def spawn_options(config = {})
       o = {pgroup: true, chdir: config[:working_dir] || '/'}
       o.update(out: [config[:stdout], 'a']) if config[:stdout]

data/lib/eye/trigger/flapping.rb

@@ -8,11 +8,6 @@ class Eye::Trigger::Flapping < Eye::Trigger
   param :retry_in, [Float, Fixnum]
   param :retry_times, [Fixnum]
 
-  def initialize(*args)
-    super
-    @last_at = nil
-  end
-
   def check(transition)
     on_flapping if transition.event == :crashed && !good?
   end

data/lib/eye/utils.rb

@@ -23,4 +23,10 @@ module Eye::Utils
     time.strftime (d1 == d2) ? D1 : D2
   end
 
+  DF = '%d %b %H:%M'
+
+  def self.human_time2(unix_time)
+    Time.at(unix_time.to_i).strftime(DF)
+  end
+
 end

data/lib/eye/utils/alive_array.rb

@@ -29,6 +29,10 @@ class Eye::Utils::AliveArray
     self.class.new super
   end
 
+  def sort(&block)
+    self.class.new super
+  end
+
   def +(other)
     if other.is_a?(Eye::Utils::AliveArray)
       @arr += other.pure

data/lib/eye/utils/leak_19.rb

@@ -1,7 +1,10 @@
 # http://stackoverflow.com/questions/7263268/ruby-symbolto-proc-leaks-references-in-1-9-2-p180
 
-class Symbol
-  def to_proc
-    lambda { |x| x.send(self) }
+unless defined?(SimpleCov) # simplecov somehow crashed with this
+
+  class Symbol
+    def to_proc
+      lambda { |x| x.send(self) }
+    end
   end
 end

data/lib/eye/utils/mini_active_support.rb

@@ -50,6 +50,11 @@ class Array
 end
 
 class Numeric
+  def percents
+    self
+  end
+  alias :percent :percents
+
   def seconds
     self
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reel-eye
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -276,6 +276,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement