bluepill 0.0.49 → 0.0.50

data/examples/example.rb

@@ -11,6 +11,9 @@ Bluepill.application(:sample_app) do |app|
     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__
@@ -63,6 +66,8 @@ Bluepill.application(:sample_app) do |app|
 
   1.times do |i|
     app.process("group_process_#{i}") do |process|
+      process.auto_start = false
+
       process.uid = "rohith"
       process.gid = "wheel"
 
@@ -79,3 +84,4 @@ Bluepill.application(:sample_app) do |app|
     end
   end
 end
+

data/examples/new_example.rb

@@ -0,0 +1,89 @@
+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
+

data/examples/new_runit_example.rb

@@ -0,0 +1,29 @@
+#! /usr/bin/env ruby
+require 'rubygems'
+require 'bluepill'
+require 'logger'
+
+# ATTENTION:
+# You must declare only one application per config when foreground mode specified
+#
+# http://github.com/Undev/runit-man used as example of monitored application.
+
+# Note that this syntax supported from bluepill 0.0.50
+
+Bluepill.application(:runit_man, :foreground => true) do
+  process("runit-man") do
+    pid_file        "/etc/service/runit-man/supervise/pid"
+
+    start_command   "/usr/bin/sv start runit-man"
+    stop_command    "/usr/bin/sv stop runit-man"
+    restart_command "/usr/bin/sv restart runit-man"
+
+    start_grace_time   1.seconds
+    restart_grace_time 7.seconds
+    stop_grace_time    7.seconds
+
+    checks :http, :within => 30.seconds, :retry_in => 7.seconds, :every => 30.seconds,
+      :url => 'http://localhost:4567/', :kind => :success, :pattern => /html/, :timeout => 3.seconds
+  end
+end
+

data/lib/bluepill/dsl.rb

@@ -2,7 +2,11 @@
 module Bluepill
   def self.application(app_name, options = {}, &block)
     app_proxy = AppProxy.new(app_name, options)
-    yield(app_proxy)
+    if block.arity == 0
+      app_proxy.instance_eval &block
+    else
+      app_proxy.instance_exec(app_proxy, &block)
+    end
     app_proxy.app.load
   end
 end

data/lib/bluepill/dsl/app_proxy.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 module Bluepill
   class AppProxy
-    APP_ATTRIBUTES = [:working_dir, :uid, :gid, :environment]
+    APP_ATTRIBUTES = [:working_dir, :uid, :gid, :environment, :auto_start ]
 
     attr_accessor *APP_ATTRIBUTES
     attr_reader :app
@@ -12,7 +12,7 @@ module Bluepill
 
     def process(process_name, &process_block)
       attributes = {}
-      APP_ATTRIBUTES.each {|a| attributes[a] = self.send(a) }
+      APP_ATTRIBUTES.each { |a| attributes[a] = self.send(a) }
 
       process_factory = ProcessFactory.new(attributes, process_block)
 

data/lib/bluepill/dsl/process_proxy.rb

@@ -7,12 +7,20 @@ module Bluepill
       @attributes = attributes
       @watches = {}
 
-      process_block.call(self)
+      if process_block.arity == 0
+        instance_eval &process_block
+      else
+        instance_exec(self, &process_block)
+      end
     end
 
     def method_missing(name, *args)
       if args.size == 1 && name.to_s =~ /^(.*)=$/
         @attributes[$1.to_sym] = args.first
+      elsif args.size == 1
+        @attributes[name.to_sym] = args.first
+      elsif args.size == 0 && name.to_s =~ /^(.*)!$/
+        @attributes[$1.to_sym] = true
       elsif args.empty? && @attributes.key?(name.to_sym)
         @attributes[name.to_sym]
       else

data/lib/bluepill/process.rb

@@ -32,7 +32,10 @@ module Bluepill
       :cache_actual_pid,
 
       :monitor_children,
-      :child_process_factory
+      :child_process_factory,
+
+      :pid_command,
+      :auto_start
     ]
 
     attr_accessor :name, :watches, :triggers, :logger, :skip_ticks_until, :process_running
@@ -215,8 +218,7 @@ module Bluepill
       if self.process_running?(true)
         self.state = 'up'
       else
-        # TODO: or "unmonitored" if bluepill was started in no auto-start mode.
-        self.state = 'down'
+        self.state = (auto_start == false) ? 'unmonitored' : 'down' # we need to check for false value
       end
     end
 
@@ -338,6 +340,10 @@ module Bluepill
     end
 
     def actual_pid
+      pid_command ? pid_from_command : pid_from_file
+    end
+
+    def pid_from_file
       return @actual_pid if cache_actual_pid? && @actual_pid
       @actual_pid = begin
         if pid_file
@@ -352,6 +358,11 @@ module Bluepill
       end
     end
 
+    def pid_from_command
+      pid = %x{#{pid_command}}.strip
+      (pid =~ /\A\d+\z/) ? pid.to_i : nil
+    end
+
     def actual_pid=(pid)
       @actual_pid = pid
     end

data/lib/bluepill/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module Bluepill
-  VERSION = "0.0.49".freeze
+  VERSION = "0.0.50".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 123
   prerelease: 
   segments: 
   - 0
   - 0
-  - 49
-  version: 0.0.49
+  - 50
+  version: 0.0.50
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 +04:00
+date: 2011-06-01 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,6 +124,8 @@ files:
 - 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