eye 0.8.1 → 0.9.pre

data/lib/eye/server.rb

@@ -25,13 +25,30 @@ class Eye::Server
     text = socket.read
 
     begin
-      cmd, *args = Marshal.load(text)
-    rescue => ex
-      error "Failed to read from socket: #{ex.message}"
-      return
+      # TODO, remove in 1.0
+
+      payload = Marshal.load(text)
+      raise "unknown payload #{payload.inspect}" unless payload.is_a?(Array)
+      cmd, *args = payload
+
+    rescue
+      # new format
+      begin
+        pos = text.index("\n")
+        msg_size = text[0..pos].to_i
+        content = text[pos + 1..-1]
+        content << socket.read(msg_size - content.length) while content.length < msg_size
+        payload = Marshal.load(content)
+        cmd = payload[:command]
+        args = payload[:args]
+
+      rescue => ex
+        error "Failed to read from socket: #{ex.message}"
+        return
+      end
     end
 
-    response = command(cmd, *args)
+    response = Eye::Control.command(cmd, *args, {})
     socket.write(Marshal.dump(response))
 
   rescue Errno::EPIPE
@@ -42,10 +59,6 @@ class Eye::Server
     socket.close
   end
 
-  def command(cmd, *args)
-    Eye::Control.command(cmd, *args)
-  end
-
   def unlink_socket_file
     File.delete(@socket_path) if @socket_path
   rescue

data/lib/eye/trigger.rb

@@ -65,19 +65,16 @@ class Eye::Trigger
     "trigger(#{@options[:type]})"
   end
 
-  def notify(transition, reason)
+  def notify(transition, state_call)
     debug { "check (:#{transition.event}) :#{transition.from} => :#{transition.to}" }
-    @reason = reason
+    @state_call = state_call
     @transition = transition
 
     check(transition) if filter_transition(transition)
 
   rescue Object => ex
-    if ex.class == Eye::Process::StateError
-      raise ex
-    else
-      log_ex(ex)
-    end
+    raise ex if ex.class == Eye::Process::StateError || ex.class == Celluloid::TaskTerminated
+    log_ex(ex)
   end
 
   param :to, [Symbol, Array]

data/lib/eye/trigger/check_dependency.rb

@@ -25,7 +25,7 @@ private
 
     if act
       processes.each do |p|
-        p.schedule act, Eye::Reason.new(:"#{act} dependecies")
+        p.schedule command: act, reason: "#{act} dependecies"
       end
     end
   end

data/lib/eye/trigger/flapping.rb

@@ -44,20 +44,18 @@ private
     debug { 'flapping recognized!!!' }
 
     process.notify :error, 'flapping!'
-    process.schedule :unmonitor, Eye::Reason::Flapping.new(:flapping)
+    process.schedule command: :unmonitor, by: :flapping
 
     return unless retry_in
     if !retry_times || (retry_times && @retry_times < retry_times)
       @retry_times += 1
-      process.schedule_in(retry_in.to_f, :conditional_start, Eye::Reason::Flapping.new('retry start after flapping'))
-    else
-      if reretry_in
-        if !reretry_times || (reretry_times && @reretry_times < reretry_times)
-          @retry_times = 0
-          @reretry_times += 1
-          process.schedule_in(reretry_in.to_f, :conditional_start, Eye::Reason::Flapping.new('reretry start after flapping'))
-        end
-      end
+      process.schedule(in: retry_in.to_f, command: :conditional_start,
+                       by: :flapping, reason: 'retry start after flapping')
+    elsif reretry_in && !reretry_times || (reretry_times && @reretry_times < reretry_times)
+      @retry_times = 0
+      @reretry_times += 1
+      process.schedule(in: reretry_in.to_f, command: :conditional_start,
+                       by: :flapping, reason: 'reretry start after flapping')
     end
   end
 

data/lib/eye/trigger/starting_guard.rb

@@ -41,23 +41,26 @@ class Eye::Trigger::StartingGuard < Eye::Trigger
       if times
         if @retry_count < times
           new_time = Time.now + every
-          process.schedule_in every, :conditional_start, Eye::Reason::StartingGuard.new('starting_guard, retry start')
+          process.schedule(in: every, command: :conditional_start,
+                           by: :starting_guard, reason: 'starting_guard, retry start')
         else
           @retry_count = 0
           @reretry_count += 1
           if retry_in && (!retry_times || (@reretry_count < retry_times))
             new_time = Time.now + retry_in
-            process.schedule_in retry_in, :conditional_start, Eye::Reason::StartingGuard.new('starting_guard, reretry start')
+            process.schedule(in: retry_in, command: :conditional_start,
+                             by: :starting_guard, reason: 'restarting_guard, retry start')
           end
         end
       else
         new_time = Time.now + every
-        process.schedule_in every, :conditional_start, Eye::Reason::StartingGuard.new('starting_guard, retry start')
+        process.schedule(in: every, command: :conditional_start,
+                         by: :starting_guard, reason: 'starting_guard, retry start')
       end
     end
 
     retry_msg = new_time ? ", retry at '#{Eye::Utils.human_time2(new_time.to_i)}'" : ''
-    process.switch :unmonitoring, Eye::Reason::StartingGuard.new("starting_guard, failed condition#{retry_msg}")
+    process.switch :unmonitoring, by: :starting_guard, reason: "failed condition#{retry_msg}"
 
     raise Eye::Process::StateError, 'starting_guard, refused to start'
   end

data/lib/eye/trigger/stop_children.rb

@@ -11,7 +11,7 @@ class Eye::Trigger::StopChildren < Eye::Trigger
 
   def check(_trans)
     debug { 'stopping children' }
-    process.children.values.pmap &:stop
+    process.children.values.pmap(&:stop)
   end
 
 end

data/lib/eye/trigger/wait_dependency.rb

@@ -20,7 +20,7 @@ private
 
     processes.each do |p|
       if p.state_name != :up && (should_start != false)
-        p.schedule :start, Eye::Reason.new(:start_dependency)
+        p.schedule command: :start, reason: 'start_dependency'
       end
     end
 
@@ -40,7 +40,7 @@ private
       process.switch :unmonitoring
 
       if retry_after
-        process.schedule_in retry_after, :start, Eye::Reason.new(:wait_dependency)
+        process.schedule in: retry_after, command: :start, reason: 'wait_dependency'
       end
 
       raise Eye::Process::StateError, 'stop transition because dependency is not up'

data/lib/eye/utils.rb

@@ -4,13 +4,14 @@ module Eye::Utils
 
   autoload :Tail,           'eye/utils/tail'
   autoload :AliveArray,     'eye/utils/alive_array'
-  autoload :CelluloidChain, 'eye/utils/celluloid_chain'
 
   def self.deep_clone(value)
-    case
-      when value.is_a?(Array) then value.map { |v| deep_clone(v) }
-      when value.is_a?(Hash) then value.each_with_object({}) { |(k, v), r| r[deep_clone(k)] = deep_clone(v) }
-      else value
+    if value.is_a?(Array)
+      value.map { |v| deep_clone(v) }
+    elsif value.is_a?(Hash)
+      value.each_with_object({}) { |(k, v), r| r[deep_clone(k)] = deep_clone(v) }
+    else
+      value
     end
   end
 
@@ -27,17 +28,17 @@ module Eye::Utils
     a
   end
 
-  D1 = '%H:%M'
-  D2 = '%b%d'
+  D1 = '%H:%M'.freeze
+  D2 = '%b%d'.freeze
 
   def self.human_time(unix_time)
     time = Time.at(unix_time.to_i)
     d1 = time.to_date
     d2 = Time.now.to_date
-    time.strftime((d1 == d2) ? D1 : D2)
+    time.strftime(d1 == d2 ? D1 : D2)
   end
 
-  DF = '%d %b %H:%M'
+  DF = '%d %b %H:%M'.freeze
 
   def self.human_time2(unix_time)
     Time.at(unix_time.to_i).strftime(DF)
@@ -56,4 +57,13 @@ module Eye::Utils
     h
   end
 
+  def self.wait_signal(timeout = nil, &block)
+    signal = Celluloid::Condition.new
+    block.call(signal)
+    signal.wait((timeout || 600).to_f)
+    :ok
+  rescue Celluloid::ConditionError
+    :timeouted
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.pre
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.17.0
 - !ruby/object:Gem::Dependency
-  name: state_machine
+  name: state_machines
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,16 +112,16 @@ dependencies:
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
@@ -389,11 +389,11 @@ files:
 - lib/eye/config.rb
 - lib/eye/control.rb
 - lib/eye/controller.rb
+- lib/eye/controller/apply.rb
 - lib/eye/controller/commands.rb
 - lib/eye/controller/helpers.rb
 - lib/eye/controller/load.rb
 - lib/eye/controller/options.rb
-- lib/eye/controller/send_command.rb
 - lib/eye/controller/status.rb
 - lib/eye/dsl.rb
 - lib/eye/dsl/application_opts.rb
@@ -408,7 +408,9 @@ files:
 - lib/eye/dsl/pure_opts.rb
 - lib/eye/dsl/validation.rb
 - lib/eye/group.rb
+- lib/eye/group/call.rb
 - lib/eye/group/chain.rb
+- lib/eye/group/data.rb
 - lib/eye/loader.rb
 - lib/eye/local.rb
 - lib/eye/logger.rb
@@ -431,7 +433,6 @@ files:
 - lib/eye/process/trigger.rb
 - lib/eye/process/validate.rb
 - lib/eye/process/watchers.rb
-- lib/eye/reason.rb
 - lib/eye/server.rb
 - lib/eye/sigar.rb
 - lib/eye/system.rb
@@ -445,7 +446,6 @@ files:
 - lib/eye/trigger/wait_dependency.rb
 - lib/eye/utils.rb
 - lib/eye/utils/alive_array.rb
-- lib/eye/utils/celluloid_chain.rb
 - lib/eye/utils/mini_active_support.rb
 - lib/eye/utils/pmap.rb
 - lib/eye/utils/tail.rb

data/lib/eye/reason.rb

@@ -1,26 +0,0 @@
-class Eye::Reason
-
-  def initialize(mes = nil)
-    @message = mes
-  end
-
-  def to_s
-    @message.to_s
-  end
-
-  def user?
-    self.class == User
-  end
-
-  class User < Eye::Reason
-
-    def to_s
-      "#{super} by user"
-    end
-
-  end
-
-  class Flapping < Eye::Reason; end
-  class StartingGuard < Eye::Reason; end
-
-end

data/lib/eye/utils/celluloid_chain.rb

@@ -1,73 +0,0 @@
-require 'celluloid'
-
-class Eye::Utils::CelluloidChain
-
-  include Celluloid
-
-  def initialize(target)
-    @target = target
-    @calls = []
-    @running = false
-    @target_class = @target.class
-  end
-
-  def add(method_name, *args)
-    @calls << { method_name: method_name, args: args }
-    ensure_process
-  end
-
-  def add_wo_dups(method_name, *args)
-    h = { method_name: method_name, args: args }
-    if @calls[-1] != h
-      @calls << h
-      ensure_process
-    end
-  end
-
-  def add_wo_dups_current(method_name, *args)
-    h = { method_name: method_name, args: args }
-    if !@calls.include?(h) && @call != h
-      @calls << h
-      ensure_process
-    end
-  end
-
-  def list
-    @calls
-  end
-
-  def names_list
-    list.map { |el| el[:method_name].to_sym }
-  end
-
-  def clear
-    @calls = []
-  end
-
-  alias_method :clear_pending_list, :clear
-
-  # need, because of https://github.com/celluloid/celluloid/issues/22
-  def inspect
-    "Celluloid::Chain(#{@target_class}: #{@calls.size})"
-  end
-
-  attr_reader :running
-
-private
-
-  def ensure_process
-    unless @running
-      @running = true
-      async.process
-    end
-  end
-
-  def process
-    while @call = @calls.shift
-      @running = true
-      @target.send(@call[:method_name], *@call[:args]) if @target.alive?
-    end
-    @running = false
-  end
-
-end