bluepill 0.0.44 → 0.0.45

data/README.md

@@ -2,7 +2,7 @@
 Bluepill is a simple process monitoring tool written in Ruby. 
 
 ## Installation
-It's hosted on [gemcutter.org][gemcutter].
+It's hosted on [gemcutter.org][gemcutter].
 
     sudo gem install bluepill
     
@@ -10,7 +10,7 @@ In order to take advantage of logging with syslog, you also need to setup your s
 
     local6.*          /var/log/bluepill.log
     
-You'll also want to add _/var/log/bluepill.log_ to _/etc/logrotate.d/syslog_ so that it gets rotated.
+You'll also want to add _/var/log/bluepill.log_ to _/etc/logrotate.d/syslog_ so that it gets rotated.
 
 Lastly, create the _/var/bluepill_ directory for bluepill to store its pid and sock files.
 
@@ -37,7 +37,7 @@ Note that since we specified a PID file and start command, bluepill assumes the
       end
     end
     
-If you don't specify a stop command, a TERM signal will be sent by default. Similarly, the default restart action is to issue stop and then start.
+If you don't specify a stop command, a TERM signal will be sent by default. Similarly, the default restart action is to issue stop and then start.
 
 Now if we want to do something more meaningful, like actually monitor the process, we do:
 
@@ -203,7 +203,7 @@ To quit bluepill:
     sudo bluepill quit
 
 ### Logging  
-By default, bluepill uses syslog local6 facility as described in the installation section. But if for any reason you don't want to use syslog, you can use a log file. You can do this by setting the :log\_file option in the config:
+By default, bluepill uses syslog local6 facility as described in the installation section. But if for any reason you don't want to use syslog, you can use a log file. You can do this by setting the :log\_file option in the config:
 
     Bluepill.application("app_name", :log_file => "/path/to/bluepill.log") do |app|
       # ...

data/Rakefile

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'rubygems'
 require 'rake'
 
@@ -13,7 +15,7 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.add_dependency("daemons", ">= 1.0.9")
     gem.add_dependency("blankslate", ">= 2.1.2.2")
-    gem.add_dependency("state_machine", ">= 0.8.0")
+    gem.add_dependency("state_machine", ">= 0.8.0", "<=0.9.4")
     gem.add_dependency("activesupport", ">= 2.3.4")
 
     gem.files -= ["bin/sample_forking_server"]

data/VERSION

@@ -1 +1 @@
-0.0.44
+0.0.45

data/bin/bluepill

@@ -28,6 +28,10 @@ OptionParser.new do |opts|
     options[:privileged] = v
   end
 
+  opts.on('-t', '--timeout Seconds', Integer, "Timeout for commands sent to the daemon, in seconds. Defaults to 10.") do |timeout|
+    options[:timeout] = timeout
+  end
+
   help = proc do
     puts opts
     puts

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.44"
+  s.version = "0.0.45"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar", "Gary Tsang", "Rohith Ravi"]
-  s.date = %q{2010-10-18}
+  s.date = %q{2011-03-24}
   s.default_executable = %q{bluepill}
   s.description = %q{Bluepill keeps your daemons up while taking up as little resources as possible. After all you probably want the resources of your server to be used by whatever daemons you are running rather than the thing that's supposed to make sure they are brought back up, should they die or misbehave.}
   s.email = %q{entombedvirus@gmail.com}
@@ -67,18 +67,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<daemons>, [">= 1.0.9"])
       s.add_runtime_dependency(%q<blankslate>, [">= 2.1.2.2"])
-      s.add_runtime_dependency(%q<state_machine>, [">= 0.8.0"])
+      s.add_runtime_dependency(%q<state_machine>, [">= 0.8.0", "<= 0.9.4"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
     else
       s.add_dependency(%q<daemons>, [">= 1.0.9"])
       s.add_dependency(%q<blankslate>, [">= 2.1.2.2"])
-      s.add_dependency(%q<state_machine>, [">= 0.8.0"])
+      s.add_dependency(%q<state_machine>, [">= 0.8.0", "<= 0.9.4"])
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     end
   else
     s.add_dependency(%q<daemons>, [">= 1.0.9"])
     s.add_dependency(%q<blankslate>, [">= 2.1.2.2"])
-    s.add_dependency(%q<state_machine>, [">= 0.8.0"])
+    s.add_dependency(%q<state_machine>, [">= 0.8.0", "<= 0.9.4"])
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
   end
 end

data/lib/bluepill/application.rb

@@ -148,7 +148,7 @@ module Bluepill
     end
     
     def setup_signal_traps
-      terminator = lambda do
+      terminator = Proc.new do
         puts "Terminating..."
         @running = false
       end

data/lib/bluepill/application/server.rb

@@ -3,11 +3,9 @@ module Bluepill
     module ServerMethods
       
       def status
-        buffer = ""
-        self.processes.each do | process |
-          buffer << "#{process.name} #{process.state}\n" +
-        end
-        buffer
+        self.processes.collect do |process|
+          "#{process.name} #{process.state}"
+        end.join("\n")
       end
 
       def restart

data/lib/bluepill/process.rb

@@ -340,6 +340,7 @@ module Bluepill
     
     def unlink_pid
       File.unlink(pid_file) if pid_file && File.exists?(pid_file)
+    rescue Errno::ENOENT
     end
     
      # Internal State Methods
@@ -382,10 +383,12 @@ module Bluepill
     def deep_copy
       # TODO: This is a kludge. Ideally, process templates 
       # would be facotries, and not a template object.
-      mutex, @event_mutex = @event_mutex, nil
+      mutex, triggers, @event_mutex, @triggers = @event_mutex, @triggers, nil, nil
       clone = Marshal.load(Marshal.dump(self))
       clone.instance_variable_set("@event_mutex", Monitor.new)
+      clone.instance_variable_set("@triggers", triggers.collect{ |t| t.deep_copy })
       @event_mutex = mutex
+      @triggers = triggers
       clone
     end
 

data/lib/bluepill/process_conditions/http.rb

@@ -19,6 +19,11 @@ module Bluepill
 
       def run(pid)
         session = Net::HTTP.new(@uri.host, @uri.port)
+        if @uri.scheme == 'https'
+          require 'net/https'
+          session.use_ssl=true
+          session.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
         session.open_timeout = @open_timeout
         session.read_timeout = @read_timeout
         hide_net_http_bug do
@@ -49,4 +54,4 @@ module Bluepill
       end
     end
   end
-end
+end

data/lib/bluepill/system.rb

@@ -1,4 +1,5 @@
 require 'etc'
+require "shellwords"
 
 module Bluepill
   # This class represents the system that bluepill is running on.. It's mainly used to memoize
@@ -72,7 +73,7 @@ module Bluepill
           
           redirect_io(*options.values_at(:stdin, :stdout, :stderr))
           
-          ::Kernel.exec(cmd)
+          ::Kernel.exec(*Shellwords.shellwords(cmd))
           exit
         end
 
@@ -136,7 +137,7 @@ module Bluepill
           cmd_err_write.close
 
           # finally, replace grandchild with cmd
-          ::Kernel.exec(cmd)
+          ::Kernel.exec(*Shellwords.shellwords(cmd))
         }
 
         # we do not use these ends of the pipes in the child
@@ -177,7 +178,7 @@ module Bluepill
       # TODO: need a mutex here
       store[:ps_axu] ||= begin
         # BSD style ps invocation
-        lines = `ps axo pid=,ppid=,pcpu=,rss=`.split("\n")
+        lines = `ps axo pid,ppid,pcpu,rss`.split("\n")
 
         lines.inject(Hash.new) do |mem, line| 
           chunks = line.split(/\s+/)

data/lib/bluepill/trigger.rb

@@ -30,12 +30,21 @@ module Bluepill
       self.process.dispatch!(event, self.class.name.split("::").last)
     end
     
+    def deep_copy
+      # TODO: This is a kludge. Ideally, process templates 
+      # would be facotries, and not a template object.
+      mutex, @mutex = @mutex, nil
+      clone = Marshal.load(Marshal.dump(self))
+      clone.instance_variable_set("@mutex", Monitor.new)
+      @mutex = mutex
+      clone
+    end
+    
     def schedule_event(event, delay)
       # TODO: maybe wrap this in a ScheduledEvent class with methods like cancel
       thread = Thread.new(self) do |trigger|
         begin
           sleep delay.to_f
-          trigger.logger.info("Retrying from flapping")
           trigger.dispatch!(event)
           trigger.mutex.synchronize do
             trigger.scheduled_events.delete_if { |_, thread| thread == Thread.current }
@@ -57,4 +66,4 @@ module Bluepill
     end
     
   end
-end
+end

data/lib/bluepill/triggers/flapping.rb

@@ -43,11 +43,9 @@ module Bluepill
         if duration
           self.logger.info "Flapping detected: retrying in #{self.retry_in} seconds"
           
-          self.schedule_event(:start, self.retry_in)
-          
-          # this happens in the process' thread so we don't have to worry about concurrency issues with this event
-          self.dispatch!(:unmonitor)
-          
+          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)
+
           @timeline.clear
           
           # This will prevent a transition from happening in the process state_machine
@@ -56,4 +54,4 @@ module Bluepill
       end
     end
   end
-end
+end

data/lib/bluepill/version.rb

@@ -1,3 +1,3 @@
 module Bluepill
-  VERSION = "0.0.44"
+  VERSION = "0.0.45"
 end

data/lib/example.rb

@@ -6,7 +6,7 @@ ROOT_DIR = "/tmp/bp"
 
 # Watch with 
 # watch -n0.2 'ps axu | egrep "(CPU|forking|bluepill|sleep)" | grep -v grep | sort'
-Bluepill.application(:sample_app, :base_dir => "/tmp/bluepill") do |app|
+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"
@@ -63,8 +63,8 @@ Bluepill.application(:sample_app, :base_dir => "/tmp/bluepill") do |app|
   
   1.times do |i|
     app.process("group_process_#{i}") do |process|
-      # process.uid = "rohith"
-      # process.gid = "wheel"
+      process.uid = "rohith"
+      process.gid = "wheel"
 
       process.stderr = "/tmp/err.log"      
       process.stdout = "/tmp/err.log"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: false
   segments: 
   - 0
   - 0
-  - 44
-  version: 0.0.44
+  - 45
+  version: 0.0.45
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -07:00
+date: 2011-03-24 00:00:00 +03:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,14 @@ dependencies:
         - 8
         - 0
         version: 0.8.0
+    - - <=
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency