bluepill 0.0.68 → 0.0.69

data/lib/bluepill/trigger.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   class Trigger
     @implementations = {}
@@ -20,15 +19,15 @@ module Bluepill
     end
 
     def reset!
-      self.cancel_all_events
+      cancel_all_events
     end
 
-    def notify(transition)
-      raise "Implement in subclass"
+    def notify(_transition)
+      fail 'Implement in subclass'
     end
 
     def dispatch!(event)
-      self.process.dispatch!(event, self.class.name.split("::").last)
+      process.dispatch!(event, self.class.name.split('::').last)
     end
 
     def schedule_event(event, delay)
@@ -38,7 +37,7 @@ module Bluepill
           sleep delay.to_f
           trigger.dispatch!(event)
           trigger.mutex.synchronize do
-            trigger.scheduled_events.delete_if { |_, thread| thread == Thread.current }
+            trigger.scheduled_events.delete_if { |_, t| t == Thread.current }
           end
         rescue StandardError => e
           trigger.logger.err(e)
@@ -46,15 +45,14 @@ module Bluepill
         end
       end
 
-      self.scheduled_events.push([event, thread])
+      scheduled_events.push([event, thread])
     end
 
     def cancel_all_events
-      self.logger.info "Canceling all scheduled events"
-      self.mutex.synchronize do
-        self.scheduled_events.each {|_, thread| thread.kill}
+      logger.info 'Canceling all scheduled events'
+      mutex.synchronize do
+        scheduled_events.each { |_, thread| thread.kill }
       end
     end
-
   end
 end

data/lib/bluepill/triggers/flapping.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module Triggers
     class Flapping < Bluepill::Trigger
@@ -6,7 +5,7 @@ module Bluepill
 
       PARAMS = [:times, :within, :retry_in]
 
-      attr_accessor *PARAMS
+      attr_accessor(*PARAMS)
       attr_reader :timeline
 
       def initialize(process, options = {})
@@ -21,10 +20,9 @@ module Bluepill
       end
 
       def notify(transition)
-        if TRIGGER_STATES.include?(transition.to_name)
-          self.timeline << Time.now.to_i
-          self.check_flapping
-        end
+        return unless TRIGGER_STATES.include?(transition.to_name)
+        timeline << Time.now.to_i
+        check_flapping
       end
 
       def reset!
@@ -34,22 +32,20 @@ module Bluepill
 
       def check_flapping
         # The process has not flapped if we haven't encountered enough incidents
-        return unless (@timeline.compact.length == self.times)
+        return unless @timeline.compact.length == times
 
         # Check if the incident happend within the timeframe
-        duration = (@timeline.last - @timeline.first) <= self.within
+        return unless @timeline.last - @timeline.first <= within
 
-        if duration
-          self.logger.info "Flapping detected: retrying in #{self.retry_in} seconds"
+        logger.info "Flapping detected: retrying in #{retry_in} seconds"
 
-          self.schedule_event(:start, self.retry_in) unless self.retry_in == 0 # retry_in zero means "do not retry, ever"
-          self.schedule_event(:unmonitor, 0)
+        schedule_event(:start, retry_in) unless retry_in.zero? # retry_in zero means "do not retry, ever"
+        schedule_event(:unmonitor, 0)
 
-          @timeline.clear
+        @timeline.clear
 
-          # This will prevent a transition from happening in the process state_machine
-          throw :halt
-        end
+        # This will prevent a transition from happening in the process state_machine
+        throw :halt
       end
     end
   end

data/lib/bluepill/util/rotational_array.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
   module Util
     class RotationalArray < Array
@@ -11,7 +10,7 @@ module Bluepill
       def push(value)
         super(value)
 
-        self.shift if self.length > @capacity
+        shift if length > @capacity
         self
       end
       alias_method :<<, :push

data/lib/bluepill/version.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 module Bluepill
-  VERSION = "0.0.68"
+  VERSION = '0.0.69'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bluepill
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.69
 platform: ruby
 authors:
 - Arya Asemanfar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,27 +99,16 @@ executables:
 - bpsv
 - sample_forking_server
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
+extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - CONTRIBUTING.md
 - DESIGN.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - bin/bluepill
 - bin/bpsv
 - bin/sample_forking_server
 - bluepill.gemspec
-- examples/example.rb
-- examples/new_example.rb
-- examples/new_runit_example.rb
-- examples/runit_example.rb
 - lib/bluepill.rb
 - lib/bluepill/application.rb
 - lib/bluepill/application/client.rb
@@ -150,13 +139,6 @@ files:
 - lib/bluepill/triggers/flapping.rb
 - lib/bluepill/util/rotational_array.rb
 - lib/bluepill/version.rb
-- local-bluepill
-- spec/lib/bluepill/application_spec.rb
-- spec/lib/bluepill/logger_spec.rb
-- spec/lib/bluepill/process_spec.rb
-- spec/lib/bluepill/process_statistics_spec.rb
-- spec/lib/bluepill/system_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/bluepill-rb/bluepill
 licenses:
 - MIT
@@ -181,11 +163,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A process monitor written in Ruby with stability and minimalism in mind.
-test_files:
-- spec/lib/bluepill/application_spec.rb
-- spec/lib/bluepill/logger_spec.rb
-- spec/lib/bluepill/process_spec.rb
-- spec/lib/bluepill/process_statistics_spec.rb
-- spec/lib/bluepill/system_spec.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,12 +0,0 @@
-*.sw?
-.DS_Store
-coverage/
-.yardoc/
-doc/
-pkg/
-*.gem
-.bundle/
-Gemfile.lock
-.idea
-bluepill.log
-

data/.rspec

@@ -1 +0,0 @@
--r ./spec/spec_helper.rb -c -f progress

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-  - rbx-2
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
-  fast_finish: true

data/Gemfile

@@ -1,27 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in bluepill.gemspec
-gemspec
-
-if RUBY_PLATFORM =~ /jruby|java/ || RUBY_VERSION =~ /1.8|1.9.2/
-  gem 'activesupport', '~> 3.0'
-else
-  gem 'activesupport', '~> 4.1'
-end
-
-gem 'rake'
-
-group :doc do
-  # YARD helper for ruby 1.8 (already embedded into ruby 1.9)
-  gem 'ripper', :platforms => :mri_18
-  gem 'maruku', '>= 0.7'
-  gem 'yard', '>= 0.8'
-end
-
-group :test do
-  gem 'coveralls', :require => false, :platforms => [:mri_19, :mri_20, :mri_21]
-  gem 'faker', '>= 1.2'
-  gem 'rest-client', '~> 1.6.0', :platforms => [:jruby, :ruby_18]
-  gem 'rspec', '>= 3'
-  gem 'simplecov', '>= 0.4', :platforms => :ruby_19
-end

data/Rakefile

@@ -1,38 +0,0 @@
-begin
-  require 'bundler'
-  Bundler::GemHelper.install_tasks
-rescue LoadError
-  $stderr.puts "Bundler not installed. You should install it with: gem install bundler"
-end
-
-$LOAD_PATH << File.expand_path('./lib', File.dirname(__FILE__))
-require 'bluepill/version'
-
-begin
-  require 'rspec/core/rake_task'
-
-  RSpec::Core::RakeTask.new
-
-  if RUBY_VERSION >= '1.9'
-    RSpec::Core::RakeTask.new(:cov) do |t|
-      ENV['ENABLE_SIMPLECOV'] = '1'
-      t.ruby_opts = '-w'
-      t.rcov_opts = %q[-Ilib --exclude "spec/*,gems/*"]
-    end
-  end
-rescue LoadError
-  $stderr.puts "RSpec not available. Install it with: gem install rspec-core rspec-expectations rr faker"
-end
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |yard|
-    yard.options << "--title='bluepill #{Bluepill::VERSION}'"
-
-  end
-rescue LoadError
-  $stderr.puts "Please install YARD with: gem install yard"
-end
-
-task :test => :spec
-task :default => :spec

data/examples/example.rb

@@ -1,87 +0,0 @@
-require 'rubygems'
-require 'bluepill'
-require 'logger'
-
-ROOT_DIR = "/tmp/bp"
-
-# Watch with
-# watch -n0.2 'ps axu | egrep "(CPU|forking|bluepill|sleep)" | grep -v grep | sort'
-Bluepill.application(:sample_app) do |app|
-  0.times do |i|
-    app.process("process_#{i}") do |process|
-      process.pid_file = "#{ROOT_DIR}/pids/process_#{i}.pid"
-
-      # Example of use of pid_command option to find memcached process
-      # process.pid_command = "ps -ef | awk '/memcached$/{ print $2 }'"
-
-      # I could not figure out a portable way to
-      # specify the path to the sample forking server across the diff developer laptops.
-      # Since this code is eval'ed we cannot reliably use __FILE__
-      process.start_command = "/Users/rohith/work/bluepill/bin/sample_forking_server #{4242 + i}"
-      process.stop_command = "kill -INT {{PID}}"
-      process.daemonize = true
-
-      process.start_grace_time = 1.seconds
-      process.restart_grace_time = 7.seconds
-      process.stop_grace_time = 7.seconds
-
-      process.uid = "rohith"
-      process.gid = "staff"
-
-      # process.checks :cpu_usage, :every => 10, :below => 0.5, :times => [5, 5]
-      process.checks :flapping, :times => 2, :within => 30.seconds, :retry_in => 7.seconds
-
-      process.monitor_children do |child_process|
-        # child_process.checks :cpu_usage,
-        #   :every => 10,
-        #   :below => 0.5,
-        #   :times => [5, 5]
-
-        # child_process.checks :mem_usage,
-        #   :every => 3,
-        #   :below => 600.kilobytes,
-        #   :times => [3, 5],
-        #   :fires => [:stop]
-
-        child_process.stop_command = "kill -QUIT {{PID}}"
-        # child_process.checks :flapping, :times => 2, :within => 30.seconds, :retry_in => 7.seconds
-      end
-    end
-  end
-
-  0.times do |i|
-    app.process("group_process_#{i}") do |process|
-      process.group = "group_1"
-      process.pid_file = "/Users/rohith/ffs/tmp/pids/mongrel_#{i}.pid"
-      process.start_command = "cd ~/ffs && mongrel_rails start -P #{process.pid_file} -p 3000 -d"
-
-      process.start_grace_time = 10.seconds
-
-      process.uid = "rohith"
-      process.gid = "staff"
-
-      # process.checks :always_true, :every => 10
-    end
-  end
-
-  1.times do |i|
-    app.process("group_process_#{i}") do |process|
-      process.auto_start = false
-
-      process.uid = "rohith"
-      process.gid = "wheel"
-
-      process.stderr = "/tmp/err.log"
-      process.stdout = "/tmp/err.log"
-
-
-      process.group = "grouped"
-      process.start_command = %Q{cd /tmp && ruby -e '$stderr.puts("hello stderr");$stdout.puts("hello stdout"); $stdout.flush; $stderr.flush; sleep 10'}
-      process.daemonize = true
-      process.pid_file = "/tmp/noperm/p_#{process.group}_#{i}.pid"
-
-      # process.checks :always_true, :every => 5
-    end
-  end
-end
-

data/examples/new_example.rb

@@ -1,89 +0,0 @@
-require 'rubygems'
-require 'bluepill'
-require 'logger'
-
-# Note that this syntax supported from bluepill 0.0.50
-
-ROOT_DIR = "/tmp/bp"
-
-# Watch with
-# watch -n0.2 'ps axu | egrep "(CPU|forking|bluepill|sleep)" | grep -v grep | sort'
-Bluepill.application(:sample_app) do
-  0.times do |i|
-    process("process_#{i}") do
-      pid_file "#{ROOT_DIR}/pids/process_#{i}.pid"
-
-      # Example of use of pid_command option to find memcached process
-      # pid_command = "ps -ef | awk '/memcached$/{ print $2 }'"
-
-      # I could not figure out a portable way to
-      # specify the path to the sample forking server across the diff developer laptops.
-      # Since this code is eval'ed we cannot reliably use __FILE__
-      start_command "/Users/rohith/work/bluepill/bin/sample_forking_server #{4242 + i}"
-      stop_command "kill -INT {{PID}}"
-      daemonize!
-
-      start_grace_time 1.seconds
-      restart_grace_time 7.seconds
-      stop_grace_time 7.seconds
-
-      uid "rohith"
-      gid "staff"
-
-      # checks :cpu_usage, :every => 10, :below => 0.5, :times => [5, 5]
-      checks :flapping, :times => 2, :within => 30.seconds, :retry_in => 7.seconds
-
-      monitor_children do
-        # checks :cpu_usage,
-        #   :every => 10,
-        #   :below => 0.5,
-        #   :times => [5, 5]
-
-        # checks :mem_usage,
-        #   :every => 3,
-        #   :below => 600.kilobytes,
-        #   :times => [3, 5],
-        #   :fires => [:stop]
-
-        stop_command "kill -QUIT {{PID}}"
-        # checks :flapping, :times => 2, :within => 30.seconds, :retry_in => 7.seconds
-      end
-    end
-  end
-
-  0.times do |i|
-    process("group_process_#{i}") do
-      group "group_1"
-      pid_file "/Users/rohith/ffs/tmp/pids/mongrel_#{i}.pid"
-      start_command "cd ~/ffs && mongrel_rails start -P #{pid_file} -p 3000 -d"
-
-      start_grace_time 10.seconds
-
-      uid "rohith"
-      gid "staff"
-
-      # checks :always_true, :every => 10
-    end
-  end
-
-  1.times do |i|
-    process("group_process_#{i}") do
-      auto_start false
-
-      uid "rohith"
-      gid "wheel"
-
-      stderr "/tmp/err.log"
-      stdout "/tmp/err.log"
-
-
-      group "grouped"
-      start_command %Q{cd /tmp && ruby -e '$stderr.puts("hello stderr");$stdout.puts("hello stdout"); $stdout.flush; $stderr.flush; sleep 10'}
-      daemonize!
-      pid_file "/tmp/noperm/p_#{group}_#{i}.pid"
-
-      # checks :always_true, :every => 5
-    end
-  end
-end
-