reel-eye 0.3.1 → 0.3.2

data/lib/eye/controller/status.rb

@@ -28,9 +28,10 @@ module Eye::Controller::Status
 
     str = <<-S
 About:  #{Eye::ABOUT}
-Info:   #{resources_str(Eye::SystemResources.resources($$), false)}
+Info:   #{resources_str(Eye::SystemResources.resources($$))}
 Ruby:   #{RUBY_DESCRIPTION}
 Logger: #{Eye::Logger.dev}
+Http:   #{@http ? "#{@http.host}:#{@http.port}" : '-'}
 Socket: #{Eye::Settings::socket_path}
 Pid:    #{Eye::Settings::pid_path}
 Actors: #{actors.inspect}
@@ -98,16 +99,11 @@ private
     end
   end
 
-  def resources_str(r, mb = true)
+  def resources_str(r)
     return '' if r.blank?
     
     res = "#{r[:start_time]}, #{r[:cpu]}%"
-
-    if r[:memory]
-      mem = mb ? "#{r[:memory] / 1024}Mb" : "#{r[:memory]}Kb"
-      res += ", #{mem}"
-    end
-
+    res += ", #{r[:memory] / 1024}Mb" if r[:memory]
     res += ", <#{r[:pid]}>"
     
     res

data/lib/eye/dsl/application_opts.rb

@@ -6,6 +6,10 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
     [:pid_file, :start_command]
   end
 
+  def not_seed_options
+    [:groups]
+  end
+
   def group(name, &block) 
     Eye::Dsl.debug "=> group #{name}"
     
@@ -28,6 +32,6 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
     group("__default__"){ process(name.to_s, &block) }
   end
 
-  def xgroup(name, &block); end
-  def xprocess(name, &block); end
+  alias xgroup nop
+  alias xprocess nop
 end

data/lib/eye/dsl/group_opts.rb

@@ -6,6 +6,10 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
     [:pid_file, :start_command]
   end
 
+  def not_seed_options
+    [:processes, :chain]
+  end
+
   def process(name, &block)
     Eye::Dsl.debug "=> process #{name}"
 
@@ -17,11 +21,8 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
     Eye::Dsl.debug "<= process #{name}"
   end
 
-  def xprocess(name, &block); end
-
-  def application
-    parent
-  end
-  alias :app :application
+  alias xprocess nop
+  alias application parent
+  alias app application
 
 end

data/lib/eye/dsl/main.rb

@@ -11,7 +11,7 @@ module Eye::Dsl::Main
     Eye::Dsl.debug "<= app: #{name}"
   end
 
-  alias :app :application 
+  alias app application
 
   def load(glob = '')
     return if glob.blank?

data/lib/eye/dsl/opts.rb

@@ -1,7 +1,7 @@
 class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
   STR_OPTIONS = [ :pid_file, :working_dir, :stdout, :stderr, :stdall, :start_command, 
-    :stop_command, :restart_command ]
+    :stop_command, :restart_command, :uid, :gid ]
   create_options_methods(STR_OPTIONS, String)
 
   BOOL_OPTIONS = [ :daemonize, :keep_alive, :control_pid, :auto_start, :stop_on_delete]
@@ -11,17 +11,14 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     :restart_grace, :stop_grace, :childs_update_period ]
   create_options_methods(INTERVAL_OPTIONS, [Fixnum, Float])
 
-  OTHER_OPTIONS = [ :environment, :stop_signals ]
-  create_options_methods(OTHER_OPTIONS)
+  create_options_methods([:environment], Hash)
+  create_options_methods([:stop_signals], Array)
+  create_options_methods([:umask], Fixnum)
 
 
   def initialize(name = nil, parent = nil)
     super(name, parent)
 
-    # ensure delete subobjects which can appears from parent config
-    @config.delete :groups
-    @config.delete :processes
-
     @config[:application] = parent.name if parent.is_a?(Eye::Dsl::ApplicationOpts)
     @config[:group] = parent.name if parent.is_a?(Eye::Dsl::GroupOpts)
 
@@ -30,14 +27,14 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   end
 
   def checks(type, opts = {})
-    type = type.to_sym
-    raise Eye::Dsl::Error, "unknown checker type #{type}" unless Eye::Checker::TYPES[type]
+    nac = Eye::Checker.name_and_class(type.to_sym)
+    raise Eye::Dsl::Error, "unknown checker type #{type}" unless nac
 
-    opts.merge!(:type => type)
+    opts.merge!(:type => nac[:type])
     Eye::Checker.validate!(opts)
     
     @config[:checks] ||= {}
-    @config[:checks][type] = opts
+    @config[:checks][nac[:name]] = opts
   end
 
   def triggers(type, opts = {})
@@ -53,9 +50,9 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
 
   # clear checks from parent
   def nochecks(type)
-    type = type.to_sym
-    raise Eye::Dsl::Error, "unknown checker type #{type}" unless Eye::Checker::TYPES[type]
-    @config[:checks].try :delete, type
+    nac = Eye::Checker.name_and_class(type.to_sym)
+    raise Eye::Dsl::Error, "unknown checker type #{type}" unless nac
+    @config[:checks].try :delete, nac[:name]
   end
 
   # clear triggers from parent
@@ -85,7 +82,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:environment].merge!(value)
   end
 
-  alias :env :environment
+  alias env environment
 
   def set_stdall(value)
     super
@@ -94,6 +91,16 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     set_stderr value
   end
 
+  def set_uid(value)
+    raise Eye::Dsl::Error, ":uid not supported by ruby (needed 2.0)" unless Eye::Settings.supported_setsid?
+    super
+  end
+
+  def set_gid(value)
+    raise Eye::Dsl::Error, ":gid not supported by ruby (needed 2.0)" unless Eye::Settings.supported_setsid?
+    super
+  end
+
   def scoped(&block)
     h = self.class.new(self.name, self)
     h.instance_eval(&block)

data/lib/eye/dsl/process_opts.rb

@@ -7,15 +7,12 @@ class Eye::Dsl::ProcessOpts < Eye::Dsl::Opts
     @config[:monitor_children].merge!(opts.config)
   end
 
-  def xmonitor_children(&block); end
+  alias xmonitor_children nop
 
   def application
     parent.try(:parent)
   end
-  alias :app :application
-
-  def group
-    parent
-  end
+  alias app application
+  alias group parent
 
 end

data/lib/eye/dsl/pure_opts.rb

@@ -49,7 +49,12 @@ class Eye::Dsl::PureOpts
 
     if parent
       @parent = parent
-      @config = merge_parent_config ? Eye::Utils::deep_clone(parent.config) : {}
+      if merge_parent_config
+        @config = Eye::Utils::deep_clone(parent.config)
+        parent.not_seed_options.each { |opt| @config.delete(opt) }
+      else
+        @config = {}
+      end
       @full_name = "#{parent.full_name}:#{@full_name}"
     else
       @config = {}
@@ -66,6 +71,10 @@ class Eye::Dsl::PureOpts
     []
   end
 
+  def not_seed_options
+    []
+  end
+
   def with_condition(cond = true, &block)
     self.instance_eval(&block) if cond && block
   end
@@ -90,6 +99,8 @@ class Eye::Dsl::PureOpts
     end
   end
 
+  def nop(*args, &block); end
+
 private
 
   def self.with_parsed_file(file_name)

data/lib/eye/group.rb

@@ -109,7 +109,7 @@ class Eye::Group
 
   def break_chain
     info "break chain"
-    scheduler.clear_pending_list
+    scheduler_clear_pending_list
     @chain_breaker = true    
   end
 

data/lib/eye/http.rb

@@ -1,3 +1,6 @@
+gem 'reel', '~> 0.4.0.pre'
+gem 'cuba'
+
 require 'reel'
 
 class Eye::Http

data/lib/eye/loader.rb

@@ -11,13 +11,3 @@ gem 'state_machine', '< 1.2'
 gem 'activesupport', '~> 3.2.0'
 gem 'i18n'
 gem 'multi_json'
-
-# reel
-gem 'reel', '~> 0.4.0.pre'
-gem 'rack'
-gem 'http'
-gem 'http_parser.rb'
-gem 'certified'
-gem 'websocket_parser'
-
-gem 'cuba'

data/lib/eye/logger.rb

@@ -42,11 +42,11 @@ class Eye::Logger
     attr_reader :dev, :log_level
 
     def link_logger(dev)
-      @dev = dev ? dev.to_s.downcase : nil
+      @dev = dev ? dev.to_s : nil
       @dev_fd = @dev
 
-      @dev_fd = STDOUT if @dev == 'stdout'
-      @dev_fd = STDERR if @dev == 'stderr'
+      @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.level = self.log_level || Logger::INFO
@@ -77,4 +77,4 @@ private
     end
   end
 
-end
+end

data/lib/eye/process/scheduler.rb

@@ -53,6 +53,10 @@ module Eye::Process::Scheduler
   def scheduler_actions_list
     scheduler.list.map{|c| c[:args].first rescue nil }.compact
   end
+
+  def scheduler_clear_pending_list
+    scheduler.clear_pending_list
+  end
   
   def self.included(base)
     base.finalizer :remove_scheduler

data/lib/eye/process/validate.rb

@@ -1,4 +1,5 @@
 require 'shellwords'
+require 'etc'
 
 module Eye::Process::Validate
 
@@ -18,6 +19,13 @@ module Eye::Process::Validate
 
     Shellwords.shellwords(config[:stop_command]) if config[:stop_command]
     Shellwords.shellwords(config[:restart_command]) if config[:restart_command]
+
+    Etc.getpwnam(config[:uid]) if config[:uid]
+    Etc.getpwnam(config[:gid]) if config[:gid]
+
+    if config[:working_dir]
+      raise Error, "working_dir '#{config[:working_dir]}' is invalid" unless File.directory?(config[:working_dir])
+    end
   end
 
-end
+end

data/lib/eye/process/watchers.rb

@@ -46,14 +46,14 @@ private
   end  
   
   def start_checkers
-    self[:checks].each{|type, cfg| start_checker(cfg) }
+    self[:checks].each{|name, cfg| start_checker(name, cfg) }
   end
 
-  def start_checker(cfg)
+  def start_checker(name, cfg)
     subject = Eye::Checker.create(pid, cfg, logger.prefix)
 
     # ex: {:type => :memory, :every => 5.seconds, :below => 100.megabytes, :times => [3,5]}
-    add_watcher("check_#{cfg[:type]}".to_sym, subject.every, subject, &method(:watcher_tick).to_proc)
+    add_watcher("check_#{name}".to_sym, subject.every, subject, &method(:watcher_tick).to_proc)
   end
 
   def watcher_tick(subject)

data/lib/eye/settings.rb

@@ -4,7 +4,7 @@ module Eye::Settings
   module_function
   
   def dir
-    if Process::UID.eid == 0 # root
+    if root?
       '/var/run/eye'
     else
       File.expand_path(File.join(home, '.eye'))
@@ -12,13 +12,17 @@ module Eye::Settings
   end
 
   def eyeconfig
-    if Process::UID.eid == 0 # root
+    if root?
       '/etc/eye.conf'
     else
       File.expand_path(File.join(home, '.eyeconfig'))
     end
   end
 
+  def root?
+    Process::UID.eid == 0
+  end
+
   def home
     ENV['EYE_HOME'] || ENV['HOME']
   end
@@ -32,15 +36,23 @@ module Eye::Settings
   end
 
   def socket_path
-    path('sock')
+    path(ENV['EYE_SOCK'] || "sock#{ENV['EYE_V']}")
   end
   
   def pid_path
-    path('pid')
+    path(ENV['EYE_PID'] || "pid#{ENV['EYE_V']}")
   end
   
+  def cache_path
+    path("processes#{ENV['EYE_V']}.cache")
+  end
+
   def client_timeout
     5
   end
 
-end
+  def supported_setsid?
+    RUBY_VERSION >= '2.0'
+  end
+
+end

data/lib/eye/system.rb

@@ -1,5 +1,6 @@
 require 'shellwords'
 require 'pathname'
+require 'etc'
 
 module Eye::System
   class << self
@@ -134,6 +135,14 @@ module Eye::System
       o.update(out: [config[:stdout], 'a']) if config[:stdout]
       o.update(err: [config[:stderr], 'a']) if config[:stderr]
       o.update(in: config[:stdin]) if config[:stdin]
+
+      if Eye::Settings.root?
+        o.update(uid: Etc.getpwnam(config[:uid]).uid) if config[:uid]
+        o.update(gid: Etc.getpwnam(config[:gid]).gid) if config[:gid]
+      end
+
+      o.update(umask: config[:umask]) if config[:umask]
+
       o
     end
 

data/lib/eye/utils/alive_array.rb

@@ -2,7 +2,8 @@ class Eye::Utils::AliveArray
   extend Forwardable
   include Enumerable
 
-  def_delegators :@arr, :[], :<<, :clear, :delete, :size, :empty?, :push, :flatten
+  def_delegators :@arr, :[], :<<, :clear, :delete, :size, :empty?, :push, 
+                        :flatten, :present?, :uniq!
 
   def initialize(arr = [])
     @arr = arr
@@ -28,4 +29,25 @@ class Eye::Utils::AliveArray
     self.class.new super
   end
 
+  def +(other)
+    if other.is_a?(Eye::Utils::AliveArray)
+      @arr += other.pure
+    elsif other.is_a?(Array)
+      @arr += other
+    else
+      raise "Unexpected + #{other}"
+    end
+    self
+  end
+
+  def ==(other)
+    if other.is_a?(Eye::Utils::AliveArray)
+      @arr == other.pure
+    elsif other.is_a?(Array)
+      @arr == other
+    else
+      raise "Unexpected == #{other}"
+    end
+  end
+
 end