bluepill 0.0.26 → 0.0.27

data/VERSION

@@ -1 +1 @@
-0.0.26
+0.0.27

data/bin/bluepill

@@ -36,10 +36,10 @@ OptionParser.new do |opts|
     puts "Commands:"
     puts "    load CONFIG_FILE\t\tLoads new instance of bluepill using the specified config file"
     puts "    status\t\t\tLists the status of the proceses for the specified app"
-    puts "    start TARGET\t\tIssues the start command for the target process or group"
-    puts "    stop TARGET\t\t\tIssues the stop command for the target process or group"
-    puts "    restart TARGET\t\tIssues the restart command for the target process or group"
-    puts "    unmonitor TARGET\t\tStop monitoring target process or group"
+    puts "    start [TARGET]\t\tIssues the start command for the target process or group, defaults to all processes"
+    puts "    stop [TARGET]\t\tIssues the stop command for the target process or group, defaults to all processes"
+    puts "    restart [TARGET]\t\tIssues the restart command for the target process or group, defaults to all processes"
+    puts "    unmonitor [TARGET]\t\tStop monitoring target process or group, defaults to all processes"
     puts "    log [TARGET]\t\tShow the log for the specified process or group, defaults to all for app"
     puts "    quit\t\t\tStop bluepill"
     puts

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.26"
+  s.version = "0.0.27"
 
   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{2009-12-02}
+  s.date = %q{2009-12-05}
   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}

data/lib/bluepill/application.rb

@@ -78,7 +78,7 @@ module Bluepill
     
     PROCESS_COMMANDS.each do |command|
       class_eval <<-END
-        def #{command}(group_name, process_name = nil)
+        def #{command}(group_name = nil, process_name = nil)
           self.send_to_process_or_group(:#{command}, group_name, process_name)
         end
       END
@@ -90,10 +90,18 @@ module Bluepill
       self.groups[group_name] ||= Group.new(group_name, :logger => self.logger.prefix_with(group_name))
       self.groups[group_name].add_process(process)
     end
+    
+    def version
+      Bluepill::VERSION
+    end
 
     protected
     def send_to_process_or_group(method, group_name, process_name)
-      if self.groups.key?(group_name)
+      if group_name.nil? && process_name.nil?
+        self.groups.values.collect do |group|
+          group.send(method)
+        end.flatten
+      elsif self.groups.key?(group_name)
         self.groups[group_name].send(method, process_name)
       elsif process_name.nil?
         # they must be targeting just by process name
@@ -109,17 +117,18 @@ module Bluepill
     def start_listener
       @listener_thread.kill if @listener_thread
       @listener_thread = Thread.new do
-        begin
-          loop do
+        loop do
+          begin
             client = self.socket.accept
             command, *args = client.readline.strip.split(":")
             response = self.send(command, *args)
             client.write(Marshal.dump(response))
+          rescue StandardError => e
+            logger.err("Got exception in cmd listener: %s `%s`" % [e.class.name, e.message])
+            e.backtrace.each {|l| logger.err(l)}
+          ensure
             client.close
           end
-        rescue StandardError => e
-          logger.err("Got exception in cmd listener: %s `%s`" % [e.class.name, e.message])
-          e.backtrace.each {|l| logger.err(l)}
         end
       end
     end

data/lib/bluepill/controller.rb

@@ -21,10 +21,6 @@ module Bluepill
     def handle_command(application, command, *args)
       case command.to_sym
       when *Application::PROCESS_COMMANDS
-        if args.compact.empty?
-          $stderr.puts "You must specify a target process or group for the #{command} command."
-          exit(8)
-        end
         # these need to be sent to the daemon and the results printed out
         affected = self.send_to_daemon(application, command, *args)
         if affected.empty?
@@ -61,9 +57,9 @@ module Bluepill
     end
     
     def send_to_daemon(application, command, *args)
-
       begin
         Timeout::timeout(Socket::TIMEOUT) do
+          verify_version!(application)
           buffer = ""
           socket = Socket.client(base_dir, application) # Something that should be interrupted if it takes too much time...
           socket.puts(([command] + args).join(":"))
@@ -107,5 +103,22 @@ module Bluepill
         FileUtils.mkdir_p(dir) unless File.exists?(dir)
       end
     end
+    
+    def verify_version!(application)
+      begin
+        socket = Socket.client(self.base_dir, application)
+        socket.puts("version")
+        buffer = ""
+        while line = socket.gets
+          buffer << line
+        end
+        version = Marshal.load(buffer)
+        if version != Bluepill::VERSION
+          abort("The running version of your daemon seems to be out of date.\nDaemon Version: #{version}, CLI Version: #{Bluepill::VERSION}")
+        end
+      rescue ArgumentError
+        abort("The running version of your daemon seems to be out of date.")
+      end
+    end
   end
 end

data/lib/bluepill/version.rb

@@ -1,3 +1,3 @@
 module Bluepill
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

data/lib/example.rb

@@ -1,18 +1,12 @@
-module Bluepill
-  module ProcessConditions
-    class ProcMemUsage < MemUsage
-      def run(pid)
-        rand(1000)
-      end
-    end
-  end
-end
+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, :log_file => "/Users/arya/Desktop/bp.log") 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"
@@ -67,7 +61,7 @@ Bluepill.application(:sample_app, :log_file => "/Users/arya/Desktop/bp.log") do
     end
   end
   
-  2.times do |i|
+  1.times do |i|
     app.process("group_process_#{i}") do |process|
       process.uid = "arya"
       process.gid = "wheel"
@@ -77,26 +71,11 @@ Bluepill.application(:sample_app, :log_file => "/Users/arya/Desktop/bp.log") do
 
       
       process.group = "grouped"
-      process.start_command = %Q{ruby -e '$stderr.puts("hello stderr");$stdout.puts("hello stdout"); $stdout.flush; $stderr.flush; sleep 10'}
+      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/p_#{process.group}#{i}_.pid"
+      process.pid_file = "/tmp/p_#{process.group}_#{i}.pid"
       
       # process.checks :always_true, :every => 5
-      process.checks :cpu_usage, 
-        :every => 10, 
-        :below => 0.5, 
-        :times => [5, 5]
-      
-      process.checks :mem_usage, 
-        :every => 3, 
-        :below => 600.megabytes, 
-        :times => [3, 5], 
-        :fires => [:stop]
-        
-      process.checks :proc_mem_usage, 
-        :every => 3, 
-        :below => 600.megabytes, 
-        :times => [3, 5]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -08:00
+date: 2009-12-05 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency