eye 0.9.pre → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e50d71e8909ed2df73bede83562f4254f374fa99
-  data.tar.gz: 2328cd9e596a36e42763514bf9c09190f7e7dc36
+  metadata.gz: b76b8d9060cb42b041484705984a1a7f3da93b38
+  data.tar.gz: ca3823da4f96ff0935b83687a1c1ef06716a1fbe
 SHA512:
-  metadata.gz: 675c027af39891e72aa31101cdcc18eeeeb3f8e5b04e7ef56e67e88a49f6e703efaf8301a9f8c8aa9d0d20c3c6467b5c172e6e9e9b4b5b39c850b2789d52e314
-  data.tar.gz: 2b5f93e6d191f4f65d560f54d46ffef5ba95b555f4d3911509ed9828645e9d877813864f938b5dab7aa3c85ef9ae8374583bf19987c9120447f81d55dc11721a
+  metadata.gz: 10f87c6c0916bd8384d736c23673821c4e9ba06af76ae51293e95b451319bfec6dfe9fac50aec8903cc26679143e2b2fcd47352ade2132efdbe4d656de3a65ac
+  data.tar.gz: 36bded5d52f33ff52ee0908bb16fe57c5a0afab6d8d608138fd2b398b3deb3212f4772f2c26598c6c667a81a0969e05520b39225e69955ba3ae75e618c780eac

data/.rubocop.yml

@@ -77,6 +77,9 @@ Style/PercentLiteralDelimiters:
 Metrics/LineLength:
   Max: 142
 
+Metrics/BlockLength:
+  Max: 50
+
 Metrics/PerceivedComplexity:
   Max: 15
   Exclude:

data/CHANGES.md

@@ -1,3 +1,13 @@
+0.9.1
+-------
+* fix client protocol compatibility with old server
+
+0.9
+-------
+* replace old gem state_machine, to state_machines
+* rewrite internal scheduler for chains
+* change client-server protocol (recommend to quit server and up after update gem)
+
 0.8.1
 -------
 * allow matching many apps when mask started with '*' (#169)

data/examples/custom_trigger.eye

@@ -2,7 +2,7 @@
 
 class Eye::Trigger::FixCrash < Eye::Trigger::Custom
 
-  param :times, Fixnum, nil, 1
+  param :times, Integer, nil, 1
   param_default :to, :up
 
   def check(_)

data/examples/triggers.eye

@@ -45,7 +45,7 @@ Eye.app :triggers do
     daemonize true
 
     app_name = app.name
-    trigger :transition, event: :restarting, do: ->{
+    trigger :transition, event: :restarting, do: -> {
       info 'send restarting to :a'
       Eye::Control.command('restart', "#{app_name}:a")
     }

data/lib/eye.rb

@@ -1,5 +1,5 @@
 module Eye
-  VERSION   = '0.9.pre'
+  VERSION   = '0.9.1'
   ABOUT     = "Eye v#{VERSION} (c) 2012-2016 @kostya"
   PROCLINE  = "eye monitoring v#{VERSION}"
 

data/lib/eye/checker.rb

@@ -23,10 +23,10 @@ class Eye::Checker
 
   attr_accessor :value, :values, :options, :pid, :type, :check_count, :process
 
-  param :every, [Fixnum, Float], false, 5
-  param :times, [Fixnum, Array], nil, 1
+  param :every, [Integer, Float], false, 5
+  param :times, [Integer, Array], nil, 1
   param :fires, [Symbol, Array, Proc], nil, nil, [:stop, :restart, :unmonitor, :start, :delete, :nothing, :notify]
-  param :initial_grace, [Fixnum, Float]
+  param :initial_grace, [Integer, Float]
   param :skip_initial_fails, [TrueClass, FalseClass]
 
   def self.name_and_class(type)
@@ -253,8 +253,8 @@ class Eye::Checker
 
   class Measure < Eye::Checker
 
-    param :below, [Fixnum, Float]
-    param :above, [Fixnum, Float]
+    param :below, [Integer, Float]
+    param :above, [Integer, Float]
 
     def good?(value)
       return false if below && (value > below)

data/lib/eye/checker/http.rb

@@ -8,10 +8,10 @@ class Eye::Checker::Http < Eye::Checker::Defer
   param :url,           String, true
   param :proxy_url,     String
   param :pattern,       [String, Regexp]
-  param :kind,          [String, Fixnum, Symbol]
-  param :timeout,       [Fixnum, Float]
-  param :open_timeout,  [Fixnum, Float]
-  param :read_timeout,  [Fixnum, Float]
+  param :kind,          [String, Integer, Symbol]
+  param :timeout,       [Integer, Float]
+  param :open_timeout,  [Integer, Float]
+  param :read_timeout,  [Integer, Float]
 
   attr_reader :uri
 
@@ -21,7 +21,7 @@ class Eye::Checker::Http < Eye::Checker::Defer
     @uri = URI.parse(url)
     @proxy_uri = URI.parse(proxy_url) if proxy_url
     @kind = case kind
-      when Fixnum then Net::HTTPResponse::CODE_TO_OBJ[kind.to_s]
+      when Integer then Net::HTTPResponse::CODE_TO_OBJ[kind.to_s]
       when String, Symbol then Net.const_get("HTTP#{kind.to_s.camelize}") rescue Net::HTTPSuccess
       else Net::HTTPSuccess
     end

data/lib/eye/checker/socket.rb

@@ -13,9 +13,9 @@ class Eye::Checker::Socket < Eye::Checker::Defer
   # :protocol      way of pack,unpack messages (default = socket default), example: :protocol => :em_object
 
   param :addr,          String, true
-  param :timeout,       [Fixnum, Float]
-  param :open_timeout,  [Fixnum, Float]
-  param :read_timeout,  [Fixnum, Float]
+  param :timeout,       [Integer, Float]
+  param :open_timeout,  [Integer, Float]
+  param :read_timeout,  [Integer, Float]
   param :send_data
   param :expect_data,   [String, Regexp, Proc]
   param :protocol,      [Symbol], nil, nil, [:default, :em_object, :raw]

data/lib/eye/client.rb

@@ -5,13 +5,20 @@ class Eye::Client
 
   attr_reader :socket_path
 
-  def initialize(socket_path)
+  def initialize(socket_path, type = :old)
     @socket_path = socket_path
+    @type = type
   end
 
+  SIGN = 123_566_983
+
   def execute(h = {})
-    payload = Marshal.dump(h)
-    payload = payload.length.to_s + "\n" + payload
+    payload = if @type == :old
+      Marshal.dump([h[:command], *h[:args]]) # TODO: remove in 1.0
+    else
+      payload = Marshal.dump(h)
+      [SIGN, payload.length].pack('N*') + payload
+    end
     timeout = h[:timeout] || Eye::Local.client_timeout
     attempt_command(payload, timeout)
   end

data/lib/eye/dsl/config_opts.rb

@@ -1,6 +1,6 @@
 class Eye::Dsl::ConfigOpts < Eye::Dsl::PureOpts
 
-  create_options_methods([:logger_level], Fixnum)
+  create_options_methods([:logger_level], Integer)
   create_options_methods([:http], Hash)
 
   def logger(*args)

data/lib/eye/dsl/opts.rb

@@ -11,10 +11,10 @@ class Eye::Dsl::Opts < Eye::Dsl::PureOpts
   INTERVAL_OPTIONS = [:check_alive_period, :start_timeout, :restart_timeout, :stop_timeout, :start_grace,
                       :restart_grace, :stop_grace, :children_update_period, :restore_in,
                       :auto_update_pidfile_grace, :revert_fuckup_pidfile_grace, :check_identity_period, :check_identity_grace].freeze
-  create_options_methods(INTERVAL_OPTIONS, [Fixnum, Float])
+  create_options_methods(INTERVAL_OPTIONS, [Integer, Float])
 
   create_options_methods([:environment], Hash)
-  create_options_methods([:umask], Fixnum)
+  create_options_methods([:umask], Integer)
 
   def initialize(name = nil, parent = nil)
     super(name, parent)
@@ -212,12 +212,12 @@ private
     while s.present?
       sig = s.shift
       timeout = s.shift
-      if sig && ![String, Symbol, Fixnum].include?(sig.class)
+      if sig && !([String, Symbol].include?(sig.class) || sig.is_a?(Integer))
         raise Eye::Dsl::Error, "signal should be String, Symbol, Fixnum, not #{sig.inspect}"
       end
 
-      if timeout && ![Fixnum, Float].include?(timeout.class)
-        raise Eye::Dsl::Error, "signal sleep should be Numeric, not #{timeout.inspect}"
+      if timeout && !timeout.is_a?(Numeric)
+        raise Eye::Dsl::Error, "signal sleep should be Numeric, not #{timeout.inspect} - #{timeout.class}"
       end
     end
   end

data/lib/eye/notify/jabber.rb

@@ -8,7 +8,7 @@ class Eye::Notify::Jabber < Eye::Notify
   # end
 
   param :host, String, true
-  param :port, [String, Fixnum], true
+  param :port, [String, Integer], true
   param :user, String, true
   param :password, String
 

data/lib/eye/notify/mail.rb

@@ -8,7 +8,7 @@ class Eye::Notify::Mail < Eye::Notify
   # end
 
   param :host, String, true
-  param :port, [String, Fixnum], true
+  param :port, [String, Integer], true
 
   param :domain, String
   param :user, String

data/lib/eye/server.rb

@@ -34,9 +34,10 @@ class Eye::Server
     rescue
       # new format
       begin
-        pos = text.index("\n")
-        msg_size = text[0..pos].to_i
-        content = text[pos + 1..-1]
+        sign, msg_size = text[0...8].unpack('N*')
+        raise "unknown protocol #{sign}" unless sign == Eye::Client::SIGN
+        msg_size = text[4...8].unpack('N')[0]
+        content = text[8..-1]
         content << socket.read(msg_size - content.length) while content.length < msg_size
         payload = Marshal.load(content)
         cmd = payload[:command]

data/lib/eye/trigger/flapping.rb

@@ -3,12 +3,12 @@ class Eye::Trigger::Flapping < Eye::Trigger
   # trigger :flapping, :times => 10, :within => 1.minute,
   #         :retry_in => 10.minutes, :retry_times => 15
 
-  param :times, [Fixnum], true, 5
-  param :within, [Float, Fixnum], true
-  param :retry_in, [Float, Fixnum]
-  param :retry_times, [Fixnum]
-  param :reretry_in, [Float, Fixnum]
-  param :reretry_times, [Fixnum]
+  param :times, [Integer], true, 5
+  param :within, [Float, Integer], true
+  param :retry_in, [Float, Integer]
+  param :retry_times, [Integer]
+  param :reretry_in, [Float, Integer]
+  param :reretry_times, [Integer]
 
   def initialize(*args)
     super

data/lib/eye/trigger/starting_guard.rb

@@ -6,10 +6,10 @@ class Eye::Trigger::StartingGuard < Eye::Trigger
   #
   # trigger :starting_guard, every: 10.seconds, should: ->{ `cat /tmp/bla` == "bla" }
 
-  param :every, [Float, Fixnum], false, 10
-  param :times, [Fixnum]
-  param :retry_in, [Float, Fixnum]
-  param :retry_times, [Fixnum]
+  param :every, [Float, Integer], false, 10
+  param :times, [Integer]
+  param :retry_in, [Float, Integer]
+  param :retry_times, [Integer]
   param :should, [Proc, Symbol]
 
   def initialize(*args)

data/lib/eye/trigger/stop_children.rb

@@ -4,7 +4,7 @@ class Eye::Trigger::StopChildren < Eye::Trigger
   #
   # trigger :stop_children
 
-  param :timeout, [Fixnum, Float], nil, 60
+  param :timeout, [Integer, Float], nil, 60
 
   # default on stopped, crashed
   param_default :event, [:stopped, :crashed]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye
 version: !ruby/object:Gem::Version
-  version: 0.9.pre
+  version: 0.9.1
 platform: ruby
 authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -469,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Process monitoring tool. Inspired from Bluepill and God. Requires Ruby(MRI)