eye 0.6.1 → 0.6.2.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGE3MGMyMzNhZDBlYmQ5ZTdmYWEyMDMxODljMTgzODRlOGJjNzY5Nw==
+    ZjNkZTlhODlmNzc5YmZjNzhlZDVmYmVmZDQ0MGFjYjBhYzY0NDYzYg==
   data.tar.gz: !binary |-
-    NDY3NTA4MzliNzZjN2ZkYTg1OGM4OGIwODk3NWRkYzJlOWE3MzM3Yg==
+    MmNmM2ExMTcwMDMxOGI3NjEwNjAxYWFkNGZkY2MxNDIxNTNkYTI3Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZTM4ZTdkZmI2ZGViN2JlYjZmZjg0NmUyOTFjZWY1OGMyOGQ5NTEwMDY0Yjg0
-    MDdjMmJkMTI1ZTU2NDk4MjFjMjBlYTRmZWI5NzMwMTU1M2YzZTM3M2I1YzQx
-    OWQyMzYwMjliODM5YmVjM2RhMmY2MTgzYzZhYjBjZWRjNmJmOTg=
+    YjJlYzQwZWY4OTY2MzUzODAzYzUzZDg5ZDU4MTJmMTk5NTE1YWEzYmMzMDBl
+    OGUwYmU0MjI0NjFiMjU3N2NlYjQ1N2E5YjZkMmZmMjhkZDRlYjVhMDRjMDY4
+    ZDE3ZGE1NjVhNzBkMzY3NGEzZmM1NzNiMzhjMzEwMTZmNjk1YjQ=
   data.tar.gz: !binary |-
-    ODVjMTcyZGFlZTQyNzczMWM2MDU2MWU4Mzc0NDI0MzBlZGRmNzNkYjQyNTQ2
-    ZWExZjcyMTVjYjUxNTc4MDY4Yjc3YTliZTQ4MmU1ZDdmMWNkOTUxYTVlOGQx
-    ODliODNkY2Q5ZTNlNzA1N2FlZjhiOGVlNWQ0MzlhN2E2MzFiZjY=
+    NWVhZmIwZTcxOWY3N2RhMmFhM2JlN2M2NjU3OGQ1NjdkYjQxMDRiZWViYTQy
+    YWFjOWU3MjdlMjZlZTRhOTczY2U2NWQ0ZmNlYjRjMWM4ZjgzZDg1NzM0YzNm
+    MTYxYjcyOTBjZTg5NGYzNjczYzU4YTAzNTZkMTM2MTBkYjhkMDY=

data/bin/loader_eye

@@ -54,7 +54,7 @@ Eye::Control # preload
 
 if config
   res = server.command('load', config)
-  exit if res.values.any? { |r| r[:error] }
+  exit(1) if res.values.any? { |r| r[:error] }
 end
 
 Eye::Control.set_proc_line

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye
-  VERSION   = "0.6.1"
+  VERSION   = "0.6.2.pre"
   ABOUT     = "Eye v#{VERSION} (c) 2012-2014 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 

data/lib/eye/cli.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 gem 'thor'
 require 'thor'
 
@@ -88,7 +90,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|
@@ -158,6 +160,11 @@ class Eye::Cli < Thor
   rescue Interrupt
   end
 
+  desc "user_command CMD [MASK]", "execute user_command (dsl command)"
+  def user_command(cmd, *args)
+    send_command(:user_command, cmd, *args)
+  end
+
 private
 
   def error!(msg)

data/lib/eye/cli/server.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Eye::Cli::Server
 private
 
@@ -64,7 +66,7 @@ private
     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/controller.rb

@@ -31,8 +31,6 @@ class Eye::Controller
 
   attr_reader :applications, :current_config
 
-  exclusive :load # load is hard command, so better to run it safely blocked
-
   def initialize
     @applications = []
     @current_config = Eye::Config.new

data/lib/eye/controller/commands.rb

@@ -17,11 +17,13 @@ module Eye::Controller::Commands
       when :start, :stop, :restart, :unmonitor, :monitor, :break_chain
         send_command(cmd, *args)
       when :delete
-        exclusive{ send_command(cmd, *args) }
+        exclusive { send_command(cmd, *args) }
       when :signal
         signal(*args)
+      when :user_command
+        user_command(*args)
       when :load
-        load(*args)
+        exclusive { load(*args) }
       when :quit
         quit
       when :stop_all

data/lib/eye/controller/load.rb

@@ -25,7 +25,7 @@ module Eye::Controller::Load
 
     set_proc_line
 
-    info "<= loading: #{obj_strs}, in: <#{$$}>"
+    info "<= loading: #{obj_strs}"
 
     res
   end

data/lib/eye/controller/send_command.rb

@@ -22,6 +22,12 @@ module Eye::Controller::SendCommand
     end
   end
 
+  def user_command(cmd, *args)
+    matched_objects(*args) do |obj|
+      obj.send_command :user_command, cmd
+    end
+  end
+
 private
 
   class Error < Exception; end

data/lib/eye/dsl/main.rb

@@ -25,8 +25,10 @@ module Eye::Dsl::Main
   def load(glob = '')
     return if glob.blank?
 
+    loaded = false
     Eye::Dsl::Opts.with_parsed_file(glob) do |mask|
       Dir[mask].each do |path|
+        loaded = true
         Eye::Dsl.debug "=> load #{path}"
         Eye.parsed_filename = path
         res = Kernel.load(path)
@@ -34,6 +36,11 @@ module Eye::Dsl::Main
         Eye::Dsl.debug "<= load #{path}"
       end
     end
+
+    unless loaded
+      puts "Warning! Eye.load not found: '#{glob}'"
+      warn "not found: '#{glob}'"
+    end
   end
 
   def config(&block)

data/lib/eye/dsl/opts.rb

@@ -68,6 +68,19 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   alias trigger triggers
   alias notrigger notriggers
 
+  def command(cmd, arg)
+    @config[:user_commands] ||= {}
+
+    if arg.is_a?(Array)
+      validate_signals(arg)
+    elsif arg.is_a?(String)
+    else
+      raise Eye::Dsl::Error, "unknown command #{cmd.inspect} type should be String or Array"
+    end
+
+    @config[:user_commands][cmd.to_sym] = arg
+  end
+
   def notify(contact, level = :warn)
     unless Eye::Process::Notify::LEVELS[level]
       raise Eye::Dsl::Error, "level should be in #{Eye::Process::Notify::LEVELS.keys}"
@@ -82,6 +95,11 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     @config[:notify].delete(contact.to_s)
   end
 
+  def set_stop_signals(value)
+    super
+    validate_signals(value)
+  end
+
   def set_environment(value)
     raise Eye::Dsl::Error, "environment should be a hash, but not #{value.inspect}" unless value.is_a?(Hash)
     @config[:environment] ||= {}
@@ -148,4 +166,18 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
     on_server
   end
 
+private
+
+  def validate_signals(signals = nil)
+    return unless signals
+    raise Eye::Dsl::Error, "signals should be Array" unless signals.is_a?(Array)
+    s = signals.clone
+    while s.present?
+      sig = s.shift
+      timeout = s.shift
+      raise Eye::Dsl::Error, "signal should be String, Symbol, Fixnum, not #{sig.inspect}" if sig && ![String, Symbol, Fixnum].include?(sig.class)
+      raise Eye::Dsl::Error, "signal sleep should be Numeric, not #{timeout.inspect}" if timeout && ![Fixnum, Float].include?(timeout.class)
+    end
+  end
+
 end

data/lib/eye/group.rb

@@ -113,6 +113,10 @@ class Eye::Group
     async_schedule :signal, sig
   end
 
+  def user_command(cmd)
+    async_schedule :user_command, cmd
+  end
+
   def break_chain
     info 'break chain'
     scheduler_clear_pending_list

data/lib/eye/logger.rb

@@ -10,7 +10,7 @@ class Eye::Logger
       super
 
       self.formatter = Proc.new do |s, d, p, m|
-        "#{d.strftime(FORMAT)} #{s.ljust(5)} -- #{m}\n"
+        "#{d.strftime(FORMAT)} $#{$$} #{s.ljust(5)} -- #{m}\n"
       end
     end
   end

data/lib/eye/process.rb

@@ -17,9 +17,9 @@ class Eye::Process
   autoload :Scheduler,        'eye/process/scheduler'
   autoload :Validate,         'eye/process/validate'
 
-  attr_accessor :pid, :watchers, :config, :states_history,
-                :children, :triggers, :name, :state_reason, :flapping_times,
-                :parent_pid
+  attr_accessor :pid, :parent_pid,
+                :watchers, :config, :states_history,
+                :children, :triggers, :name, :state_reason, :flapping_times
 
   def initialize(config)
     raise 'you must supply a pid_file location' unless config[:pid_file]

data/lib/eye/process/commands.rb

@@ -277,4 +277,27 @@ private
     sleep grace
   end
 
+  def execute_user_command(name, cmd)
+    info "executing user command #{name} #{cmd.inspect}"
+
+    # cmd is string, or array of signals
+    if cmd.is_a?(String)
+      res = execute(cmd, config.merge(:timeout => 120))
+      error "cmd #{cmd} error #{res.inspect}" if res[:error]
+    elsif cmd.is_a?(Array)
+      signals = cmd.clone
+      signal = signals.shift
+      send_signal(signal)
+
+      while signals.present?
+        delay = signals.shift
+        signal = signals.shift
+        sleep (delay.to_f)
+        send_signal(signal) if signal
+      end
+    else
+      warn "unknown user command #{c}"
+    end
+  end
+
 end

data/lib/eye/process/controller.rb

@@ -70,4 +70,10 @@ module Eye::Process::Controller
     send_signal(sig) if self.pid
   end
 
+  def user_command(name)
+    if self[:user_commands] && c = self[:user_commands][name.to_sym]
+      execute_user_command(name, c)
+    end
+  end
+
 end

data/lib/eye/process/system.rb

@@ -3,10 +3,23 @@ require 'timeout'
 module Eye::Process::System
 
   def load_pid_from_file
-    if File.exists?(self[:pid_file_ex])
+    res = if File.exists?(self[:pid_file_ex])
       _pid = File.read(self[:pid_file_ex]).to_i
       _pid > 0 ? _pid : nil
     end
+
+    # check pid from pid_file, in case when server reboot, or something
+    #   sometimes pid can be one of the eye-self(lwp) pid, we dont want
+    #   eye to die
+    if res && res != self.pid
+      cmd = Eye::Sigar.proc_args(res)[0].to_s rescue ''
+      if res == $$ || cmd.start_with?(Eye::PROCLINE)
+        error "Wtf? O_o load eye-self(lwp) pid_file #{res} #{$$} '#{cmd}'"
+        return
+      end
+    end
+
+    res
   end
 
   def set_pid_from_file

data/lib/eye/process/validate.rb

@@ -28,16 +28,6 @@ module Eye::Process::Validate
         raise Error, "working_dir '#{config[:working_dir]}' is invalid" unless File.directory?(config[:working_dir])
       end
     end
-
-    if config[:stop_signals]
-      s = config[:stop_signals].clone
-      while s.present?
-        sig = s.shift
-        timeout = s.shift
-        raise Error, "signal should be String, Symbol, Fixnum, not #{sig.inspect}" if sig && ![String, Symbol, Fixnum].include?(sig.class)
-        raise Error, "signal sleep should be Numeric, not #{timeout.inspect}" if timeout && ![Fixnum, Float].include?(timeout.class)
-      end
-    end
   end
 
 end

data/lib/eye/server.rb

@@ -24,13 +24,13 @@ class Eye::Server
     text = socket.read
 
     begin
-      command, *args = Marshal.load(text)
+      cmd, *args = Marshal.load(text)
     rescue => ex
       error "Failed to read from socket: #{ex.message}"
       return
     end
 
-    response = command(command, *args)
+    response = command(cmd, *args)
     socket.write(Marshal.dump(response))
 
   rescue Errno::EPIPE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2.pre
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid