ra-bluepill 0.0.44 → 0.0.45

data/VERSION

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

data/bin/bluepill

@@ -6,7 +6,8 @@ require 'bluepill'
 options = {
   :log_file   => "/var/log/bluepill.log",
   :base_dir   => "/var/bluepill",
-  :privileged => true
+  :privileged => true,
+  :timeout => 10
 }
 
 OptionParser.new do |opts|
@@ -28,6 +29,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
@@ -57,7 +62,7 @@ end
 
 APPLICATION_COMMANDS = %w(status start stop restart unmonitor quit log)
 
-controller = Bluepill::Controller.new(options.slice(:base_dir, :log_file))
+controller = Bluepill::Controller.new(options.slice(:base_dir, :log_file, :timeout))
 
 if controller.running_applications.include?(File.basename($0)) && File.symlink?($0)
   # bluepill was called as a symlink with the name of the target application
@@ -97,7 +102,7 @@ if options[:command] == "load"
     file_path = File.expand_path(file)
 
     exec(ruby, "-I#{load_path}", '-rbluepill', file_path)
-    
+
   else
     $stderr.puts "Can't find file: #{file}"
   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/controller.rb

@@ -2,22 +2,23 @@ require 'fileutils'
 
 module Bluepill
   class Controller
-    attr_accessor :base_dir, :log_file, :sockets_dir, :pids_dir
-    
+    attr_accessor :base_dir, :log_file, :sockets_dir, :pids_dir, :timeout
+
     def initialize(options = {})
       self.log_file = options[:log_file]
       self.base_dir = options[:base_dir]
+      self.timeout = options[:timeout]
       self.sockets_dir = File.join(base_dir, 'socks')
       self.pids_dir = File.join(base_dir, 'pids')
-      
+
       setup_dir_structure
       cleanup_bluepill_directory
     end
-    
+
     def running_applications
       Dir[File.join(sockets_dir, "*.sock")].map{|x| File.basename(x, ".sock")}
     end
-    
+
     def handle_command(application, command, *args)
       case command.to_sym
       when :status
@@ -44,10 +45,10 @@ module Bluepill
       when :log
         log_file_location = self.send_to_daemon(application, :log_file)
         log_file_location = self.log_file if log_file_location.to_s.strip.empty?
-        
+
         requested_pattern = args.first
         grep_pattern = self.grep_pattern(application, requested_pattern)
-        
+
         tail = "tail -n 100 -f #{log_file_location} | grep -E '#{grep_pattern}'"
         puts "Tailing log for #{requested_pattern}..."
         Kernel.exec(tail)
@@ -56,13 +57,13 @@ module Bluepill
         exit(1)
       end
     end
-    
+
     def send_to_daemon(application, command, *args)
       begin
         verify_version!(application)
 
         command = ([command, *args]).join(":")
-        response = Socket.client_command(base_dir, application, command)
+        response = Socket.client_command(base_dir, application, command, timeout)
         if response.is_a?(Exception)
           $stderr.puts "Received error from server:"
           $stderr.puts response.inspect
@@ -76,13 +77,13 @@ module Bluepill
         abort("Connection Refused: Server is not running")
       end
     end
-    
+
     def grep_pattern(application, query = nil)
       pattern = [application, query].compact.join(':')
       ['\[.*', Regexp.escape(pattern), '.*'].compact.join
     end
     private
-    
+
     def cleanup_bluepill_directory
       self.running_applications.each do |app|
         pid = pid_for(app)
@@ -94,21 +95,21 @@ module Bluepill
         end
       end
     end
-    
+
     def pid_for(app)
       pid_file = File.join(self.pids_dir, "#{app}.pid")
       File.exists?(pid_file) && File.read(pid_file).to_i
     end
-    
+
     def setup_dir_structure
       [@sockets_dir, @pids_dir].each do |dir|
         FileUtils.mkdir_p(dir) unless File.exists?(dir)
       end
     end
-    
+
     def verify_version!(application)
       begin
-        version = Socket.client_command(base_dir, application, "version")
+        version = Socket.client_command(base_dir, application, "version", timeout)
         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/process.rb

@@ -382,10 +382,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/socket.rb

@@ -2,9 +2,12 @@ require 'socket'
 
 module Bluepill
   module Socket
+<<<<<<< HEAD
     TIMEOUT = 10
     RETRY = 5
     @@timeout = 0
+=======
+>>>>>>> akzhan
 
     extend self
 
@@ -12,9 +15,13 @@ module Bluepill
       UNIXSocket.open(socket_path(base_dir, name), &b)
     end
 
+<<<<<<< HEAD
     def client_command(base_dir, name, command)
+=======
+    def client_command(base_dir, name, command, timeout)
+>>>>>>> akzhan
       client(base_dir, name) do |socket|
-        Timeout.timeout(TIMEOUT) do
+        Timeout.timeout(timeout) do
           socket.puts command
           Marshal.load(socket)
         end
@@ -54,3 +61,7 @@ module Bluepill
     end
   end
 end
+<<<<<<< HEAD
+=======
+
+>>>>>>> akzhan

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

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/ra-bluepill.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ra-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"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ra-bluepill
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: 
   segments: 
   - 0
   - 0
-  - 44
-  version: 0.0.44
+  - 45
+  version: 0.0.45
 platform: ruby
 authors: 
 - Arya Asemanfar