bluepill 0.0.32 → 0.0.33

data/VERSION

@@ -1 +1 @@
-0.0.32
+0.0.33

data/bin/bluepill

@@ -55,7 +55,10 @@ APPLICATION_COMMANDS = %w(status start stop restart unmonitor quit log)
 
 controller = Bluepill::Controller.new(options.slice(:base_dir, :log_file))
 
-if controller.running_applications.include?(ARGV.first)
+if controller.running_applications.include?(File.basename($0)) && File.symlink?($0)
+  # bluepill was called as a symlink with the name of the target application
+  options[:application] = File.basename($0)
+elsif controller.running_applications.include?(ARGV.first)
   # the first arg is the application name
   options[:application] = ARGV.shift
 elsif APPLICATION_COMMANDS.include?(ARGV.first)

data/bluepill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bluepill}
-  s.version = "0.0.32"
+  s.version = "0.0.33"
 
   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-01-30}
+  s.date = %q{2010-02-10}
   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

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Bluepill
   class Application
     PROCESS_COMMANDS = [:start, :stop, :restart, :unmonitor, :status]
@@ -20,8 +22,14 @@ module Bluepill
       
       self.setup_signal_traps
       self.setup_pids_dir
+      
+      @mutex = Mutex.new
+    end
+
+    def mutex(&b)
+      @mutex.synchronize(&b)
     end
-        
+
     def load
       begin
         self.start_server
@@ -79,7 +87,7 @@ module Bluepill
             client = self.socket.accept
             command, *args = client.readline.strip.split(":")
             response = begin
-              self.send(command, *args)
+              mutex { self.send(command, *args) }
             rescue Exception => e
               e
             end
@@ -116,8 +124,10 @@ module Bluepill
     def run
       @running = true # set to false by signal trap
       while @running
-        System.reset_data
-        self.groups.each { |_, group| group.tick }
+        mutex do
+          System.reset_data
+          self.groups.each { |_, group| group.tick }
+        end
         sleep 1
       end
       cleanup

data/lib/bluepill/controller.rb

@@ -58,30 +58,19 @@ module Bluepill
     
     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(":"))
-          while line = socket.gets
-            buffer << line
-          end
-          if buffer.size > 0
-            response = Marshal.load(buffer)
-            if response.is_a?(Exception)
-              $stderr.puts "Received error from server:"
-              $stderr.puts response.inspect
-              $stderr.puts response.backtrace.join("\n")
-              exit(8)
-            else
-              response
-            end
-          else
-            abort("No response from server")
-          end
+        verify_version!(application)
+
+        command = ([command, *args]).join(":")
+        response = Socket.client_command(base_dir, application, command)
+        if response.is_a?(Exception)
+          $stderr.puts "Received error from server:"
+          $stderr.puts response.inspect
+          $stderr.puts response.backtrace.join("\n")
+          exit(8)
+        else
+          response
         end
-      rescue Timeout::Error
-        abort("Socket Timeout: Server may not be responding")
+
       rescue Errno::ECONNREFUSED
         abort("Connection Refused: Server is not running")
       end
@@ -118,13 +107,7 @@ module Bluepill
     
     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)
+        version = Socket.client_command(base_dir, application, "version")
         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

data/lib/bluepill/socket.rb

@@ -3,10 +3,22 @@ require 'socket'
 module Bluepill
   module Socket
     TIMEOUT = 10
+
     extend self
 
-    def client(base_dir, name)
-      UNIXSocket.open(socket_path(base_dir, name))
+    def client(base_dir, name, &b)
+      UNIXSocket.open(socket_path(base_dir, name), &b)
+    end
+    
+    def client_command(base_dir, name, command)
+      client(base_dir, name) do |socket|
+        Timeout.timeout(TIMEOUT) do
+          socket.puts command
+          Marshal.load(socket)
+        end
+      end
+    rescue EOFError, Timeout::Error
+      abort("Socket Timeout: Server may not be responding")
     end
     
     def server(base_dir, name)

data/lib/bluepill/version.rb

@@ -1,3 +1,3 @@
 module Bluepill
-  VERSION = "0.0.32"
+  VERSION = "0.0.33"
 end

data/lib/example.rb

@@ -80,11 +80,11 @@ Bluepill.application(:sample_app) do |app|
 
       # process.group = "grouped"
       
-      process.start_command = "sleep 10"
+      process.start_command = "ruby /tmp/foo.rb"
       process.stop_command = "kill {{PID}}"
       process.daemonize = true
       process.pid_file = "/tmp/process_#{i}.pid"
-      
+      process.working_dir = "/tmp"
       process.checks :always_false, :every => 1, :times => [20,21]
       process.checks :flapping, :times => 200, :within => 900.seconds, :retry_in => 7.seconds
       process.checks :mem_usage, :every => 1, :below => 300.megabytes, :times => [3,5]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluepill
 version: !ruby/object:Gem::Version 
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 -08:00
+date: 2010-02-10 00:00:00 -08:00
 default_executable: bluepill
 dependencies: 
 - !ruby/object:Gem::Dependency