eye 0.5.2 → 0.6

data/lib/eye/cli.rb

@@ -58,7 +58,7 @@ class Eye::Cli < Thor
 
     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?
@@ -71,7 +71,15 @@ class Eye::Cli < Thor
   end
 
   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
+      cmd(:stop_all, options[:timeout].to_i)
+    end
+
+    Eye::Local.client_timeout = 5
     res = _cmd(:quit)
 
     # if eye server got crazy, stop by force
@@ -80,7 +88,7 @@ class Eye::Cli < Thor
     # remove pid_file
     File.delete(Eye::Local.pid_path) if File.exists?(Eye::Local.pid_path)
 
-    say "quit...", :yellow
+    say "Quit :(", :yellow
   end
 
   [:start, :stop, :restart, :unmonitor, :monitor, :delete, :match].each do |_cmd|
@@ -171,4 +179,7 @@ private
     end
   end
 
+  def self.exit_on_failure?
+    true
+  end
 end

data/lib/eye/cli/commands.rb

@@ -42,9 +42,9 @@ private
       res[:backtrace].to_a.each{|line| say line, :red }
     else
       if opts[:syntax]
-        say 'config ok!', :green if !res[:empty]
+        say 'Config ok!', :green if !res[:empty]
       else
-        say 'config loaded!', :green if !res[:empty]
+        say 'Config loaded!', :green if !res[:empty]
       end
 
       if opts[:print_config]

data/lib/eye/cli/server.rb

@@ -30,8 +30,13 @@ private
     end
 
     args = []
-    args += ['-c', conf] if conf
-    args += ['-l', 'stdout']
+    args += ['--config', conf] if conf
+    args += ['--logger', 'stdout']
+    if Eye::Local.local_runner
+      args += ['--stop_all']
+      args += ['--dir', Eye::Local.dir]
+      args += ['--config', Eye::Local.eyefile] unless conf
+    end
 
     Process.exec(ruby_path, loader_path, *args)
   end
@@ -43,6 +48,8 @@ private
     ensure_stop_previous_server
 
     args = []
+    args += ['--dir', Eye::Local.dir] if Eye::Local.local_runner
+
     opts = {:out => '/dev/null', :err => '/dev/null', :in => '/dev/null',
             :chdir => '/', :pgroup => true}
 
@@ -55,8 +62,9 @@ private
     end
 
     configs.unshift(Eye::Local.eyeconfig) if File.exists?(Eye::Local.eyeconfig)
+    configs << Eye::Local.eyefile if Eye::Local.local_runner
 
-    say 'eye started!', :green
+    say 'Eye started!', :green
 
     if !configs.empty?
       say_load_result cmd(:load, *configs)

data/lib/eye/config.rb

@@ -21,7 +21,7 @@ class Eye::Config
   end
 
   # raise an error if config wrong
-  def validate!
+  def validate!(localize = true)
     all_processes = processes
 
     # Check blank pid_files
@@ -55,7 +55,7 @@ class Eye::Config
 
     # validate processes with their own validate
     all_processes.each do |process_cfg|
-      Eye::Process.validate process_cfg
+      Eye::Process.validate process_cfg, localize
     end
 
     # just to be sure ENV was not removed

data/lib/eye/controller/commands.rb

@@ -1,8 +1,14 @@
 module Eye::Controller::Commands
 
+  NOT_IMPORTANT_COMMANDS = [:info_data, :short_data, :debug_data, :history_data, :ping,
+    :logger_dev, :match, :explain, :check]
+
   # Main method, answer for the client command
   def command(cmd, *args)
-    debug "client command: #{cmd} #{args * ', '}"
+    msg = "command: #{cmd} #{args * ', '}"
+
+    log_str = "=> #{msg}"
+    NOT_IMPORTANT_COMMANDS.include?(cmd) ? debug(log_str) : info(log_str)
 
     start_at = Time.now
     cmd = cmd.to_sym
@@ -18,6 +24,8 @@ module Eye::Controller::Commands
         load(*args)
       when :quit
         quit
+      when :stop_all
+        stop_all(*args)
       when :check
         check(*args)
       when :explain
@@ -44,7 +52,9 @@ module Eye::Controller::Commands
     end
 
     GC.start
-    info "client command: #{cmd} #{args * ', '} (#{Time.now - start_at}s)"
+
+    log_str = "<= #{msg} (#{Time.now - start_at}s)"
+    NOT_IMPORTANT_COMMANDS.include?(cmd) ? debug(log_str) : info(log_str)
 
     res
   end
@@ -58,4 +68,21 @@ private
     Eye::System.send_signal($$, :KILL)
   end
 
+  # stop all processes and wait
+  def stop_all(timeout = nil)
+    exclusive do
+      send_command :break_chain, 'all'
+      send_command :stop, 'all'
+    end
+
+    # wait until all processes goes to unmonitored
+    timeout ||= 100
+
+    all_processes.pmap do |p|
+      p.wait_for_condition(timeout, 0.3) do
+        p.state_name == :unmonitored
+      end
+    end
+  end
+
 end

data/lib/eye/controller/helpers.rb

@@ -2,8 +2,9 @@ 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']
+    str += " [#{@applications.map(&:name) * ', '}]" if @applications.present?
+    str += " (v #{ENV['EYE_V']})" if ENV['EYE_V']
+    str += " (in #{Eye::Local.dir})" if Eye::Local.local_runner
     $0 = str
   end
 
@@ -18,19 +19,43 @@ module Eye::Controller::Helpers
   end
 
   def process_by_name(name)
-    all_processes.detect{|c| c.name == name}
+    name = name.to_s
+    all_processes.detect { |c| c.name == name }
   end
 
   def process_by_full_name(name)
-    all_processes.detect{|c| c.full_name == name }
+    name = name.to_s
+    all_processes.detect { |c| c.full_name == name }
+  end
+
+  def find_nearest_process(name, group_name = nil, app_name = nil)
+    return process_by_full_name(name) if name.include?(':')
+
+    if app_name
+      app = application_by_name(app_name)
+      app.groups.each do |gr|
+        p = gr.processes.detect { |c| c.name == name }
+        return p if p
+      end
+    end
+
+    if group_name
+      gr = group_by_name(group_name)
+      p = gr.processes.detect { |c| c.name == name }
+      return p if p
+    end
+
+    process_by_name(name)
   end
 
   def group_by_name(name)
-    all_groups.detect{|c| c.name == name}
+    name = name.to_s
+    all_groups.detect { |c| c.name == name }
   end
 
   def application_by_name(name)
-    @applications.detect{|c| c.name == name}
+    name = name.to_s
+    @applications.detect { |c| c.name == name }
   end
 
   def all_processes

data/lib/eye/controller/load.rb

@@ -11,7 +11,7 @@ module Eye::Controller::Load
   def load(*args)
     h = args.extract_options!
     obj_strs = args.flatten
-    info "loading: #{obj_strs}"
+    info "=> loading: #{obj_strs}"
 
     res = Hash.new
 
@@ -24,9 +24,8 @@ module Eye::Controller::Load
     end
 
     set_proc_line
-    save_cache
 
-    info "loaded: #{obj_strs}, selfpid <#{$$}>"
+    info "<= loading: #{obj_strs}, in: <#{$$}>"
 
     res
   end
@@ -34,7 +33,7 @@ module Eye::Controller::Load
 private
 
   # regexp for clean backtrace to show for user
-  BT_REGX = %r[/lib/eye/|lib/celluloid|internal:prelude|logger.rb:|active_support/core_ext|shellwords.rb].freeze
+  BT_REGX = %r[/lib/eye/|lib/celluloid|internal:prelude|logger.rb:|active_support/core_ext|shellwords.rb|kernel/bootstrap].freeze
 
   def catch_load_error(filename = nil, &block)
     { :error => false, :config => yield }
@@ -46,7 +45,7 @@ private
 
     # filter backtrace for user output
     bt = (ex.backtrace || [])
-    bt = bt.reject{|line| line.to_s =~ BT_REGX }
+    bt = bt.reject{|line| line.to_s =~ BT_REGX } unless ENV['EYE_FULL_BACKTRACE']
     error bt.join("\n")
 
     res = { :error => true, :message => ex.message }
@@ -84,7 +83,7 @@ private
     debug "parsing: #{filename}"
 
     cfg = Eye::Dsl.parse(nil, filename)
-    @current_config.merge(cfg).validate! # just validate summary config here
+    @current_config.merge(cfg).validate!(false) # just validate summary config here
     Eye.parsed_config = nil # remove link on config, for better gc
     cfg
   end

data/lib/eye/controller/options.rb

@@ -12,7 +12,7 @@ module Eye::Controller::Options
   end
 
   def set_opt_http(opts = {})
-    # stub!
+    warn "Warning, set http options not in reel-eye gem" if opts.present?
   end
 
 end

data/lib/eye/controller/send_command.rb

@@ -6,7 +6,6 @@ module Eye::Controller::SendCommand
         remove_object_from_tree(obj)
 
         set_proc_line
-        save_cache
       end
 
       obj.send_command(command)

data/lib/eye/dsl.rb

@@ -27,6 +27,7 @@ class Eye::Dsl
     def parse(content = nil, filename = nil)
       Eye.parsed_config = Eye::Config.new
       Eye.parsed_filename = filename
+      Eye.parsed_default_app = nil
 
       content = File.read(filename) if content.blank?
 
@@ -34,7 +35,7 @@ class Eye::Dsl
         Kernel.eval(content, Eye::BINDING, filename.to_s)
       end
 
-      Eye.parsed_config.validate!
+      Eye.parsed_config.validate!(false)
       Eye.parsed_config
     end
 

data/lib/eye/dsl/application_opts.rb

@@ -17,14 +17,11 @@ class Eye::Dsl::ApplicationOpts < Eye::Dsl::Opts
     opts = Eye::Dsl::GroupOpts.new(name, self)
     opts.instance_eval(&block)
 
-    if cfg = opts.config
-      @config[:groups] ||= {}
+    @config[:groups] ||= {}
+    @config[:groups][name.to_s] ||= {}
 
-      processes = cfg.delete(:processes) || {}
-      @config[:groups][name.to_s] ||= {}
-      @config[:groups][name.to_s].merge!(cfg)
-      @config[:groups][name.to_s][:processes] ||= {}
-      @config[:groups][name.to_s][:processes].merge!(processes)
+    if cfg = opts.config
+      Eye::Utils.deep_merge!(@config[:groups][name.to_s], cfg)
     end
 
     Eye::Dsl.debug "<= group #{name}"

data/lib/eye/dsl/group_opts.rb

@@ -18,7 +18,8 @@ class Eye::Dsl::GroupOpts < Eye::Dsl::Opts
     opts = Eye::Dsl::ProcessOpts.new(name, self)
     opts.instance_eval(&block)
     @config[:processes] ||= {}
-    @config[:processes][name.to_s] = opts.config if opts.config
+    @config[:processes][name.to_s] ||= {}
+    Eye::Utils.deep_merge!(@config[:processes][name.to_s], opts.config) if opts.config
 
     Eye::Dsl.debug "<= process #{name}"
     opts

data/lib/eye/dsl/helpers.rb

@@ -9,4 +9,12 @@ end
 # host name
 def hostname
   Eye::Local.host
-end
+end
+
+def example_process(proxy, name)
+  proxy.process(name) do
+    pid_file "/tmp/#{name}.pid"
+    start_command "sleep 100"
+    daemonize true
+  end
+end

data/lib/eye/dsl/main.rb

@@ -1,14 +1,20 @@
 module Eye::Dsl::Main
-  attr_accessor :parsed_config, :parsed_filename
+  attr_accessor :parsed_config, :parsed_filename, :parsed_default_app
 
   def application(name, &block)
     Eye::Dsl.check_name(name)
+    name = name.to_s
 
     Eye::Dsl.debug "=> app: #{name}"
-    opts = Eye::Dsl::ApplicationOpts.new(name)
-    opts.instance_eval(&block)
 
-    @parsed_config.applications[name.to_s] = opts.config if opts.config
+    if name == '__default__'
+      @parsed_default_app ||= Eye::Dsl::ApplicationOpts.new(name)
+      @parsed_default_app.instance_eval(&block)
+    else
+      opts = Eye::Dsl::ApplicationOpts.new(name, @parsed_default_app)
+      opts.instance_eval(&block)
+      @parsed_config.applications[name] = opts.config if opts.config
+    end
 
     Eye::Dsl.debug "<= app: #{name}"
   end
@@ -35,7 +41,7 @@ module Eye::Dsl::Main
 
     opts = Eye::Dsl::ConfigOpts.new
     opts.instance_eval(&block)
-    @parsed_config.settings.merge!(opts.config)
+    Eye::Utils.deep_merge!(@parsed_config.settings, opts.config)
 
     Eye::Dsl.debug '<= config'
   end

data/lib/eye/dsl/opts.rb

@@ -4,11 +4,12 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     :stop_command, :restart_command, :uid, :gid ]
   create_options_methods(STR_OPTIONS, String)
 
-  BOOL_OPTIONS = [ :daemonize, :keep_alive, :auto_start, :stop_on_delete, :clear_pid ]
+  BOOL_OPTIONS = [ :daemonize, :keep_alive, :auto_start, :stop_on_delete, :clear_pid, :preserve_fds, :use_leaf_child ]
   create_options_methods(BOOL_OPTIONS, [TrueClass, FalseClass])
 
   INTERVAL_OPTIONS = [ :check_alive_period, :start_timeout, :restart_timeout, :stop_timeout, :start_grace,
-    :restart_grace, :stop_grace, :children_update_period, :restore_in ]
+    :restart_grace, :stop_grace, :children_update_period, :restore_in,
+    :auto_update_pidfile_grace, :revert_fuckup_pidfile_grace ]
   create_options_methods(INTERVAL_OPTIONS, [Fixnum, Float])
 
   create_options_methods([:environment], Hash)
@@ -23,7 +24,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:group] = parent.name if parent.is_a?(Eye::Dsl::GroupOpts)
 
     # hack for full name
-    @full_name = parent.full_name if @name == '__default__'
+    @full_name = parent.full_name if @name == '__default__' && parent.respond_to?(:full_name)
   end
 
   def checks(type, opts = {})
@@ -118,25 +119,7 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   def scoped(&block)
     h = self.class.new(self.name, self)
     h.instance_eval(&block)
-
-    groups = h.config.delete :groups
-
-    if groups.present?
-      config[:groups] ||= {}
-      groups.each do |name, cfg|
-        processes = cfg.delete(:processes) || {}
-        config[:groups][name] ||= {}
-        config[:groups][name].merge!(cfg)
-        config[:groups][name][:processes] ||= {}
-        config[:groups][name][:processes].merge!(processes)
-      end
-    end
-
-    processes = h.config.delete :processes
-    if processes.present?
-      config[:processes] ||= {}
-      config[:processes].merge!(processes)
-    end
+    Eye::Utils.deep_merge!(config, h.config, [:groups, :processes])
   end
 
   # execute part of config on particular server

data/lib/eye/dsl/process_opts.rb

@@ -4,7 +4,7 @@ class Eye::Dsl::ProcessOpts < Eye::Dsl::Opts
     opts = Eye::Dsl::ChildProcessOpts.new
     opts.instance_eval(&block) if block
     @config[:monitor_children] ||= {}
-    @config[:monitor_children].merge!(opts.config)
+    Eye::Utils.deep_merge!(@config[:monitor_children], opts.config)
   end
 
   alias xmonitor_children nop
@@ -15,4 +15,22 @@ class Eye::Dsl::ProcessOpts < Eye::Dsl::Opts
   alias app application
   alias group parent
 
-end
+  def depend_on(names, opts = {})
+    names = Array(names).map(&:to_s)
+    trigger("wait_dependency_#{unique_num}", {:names => names}.merge(opts))
+    nm = @config[:name]
+    names.each do |name|
+      parent.process(name) do
+        trigger("check_dependency_#{unique_num}", :names => [ nm ] )
+      end
+    end
+  end
+
+private
+
+  def unique_num
+    $unique_num ||= 0
+    $unique_num += 1
+  end
+
+end