evented_bluepill 0.0.46 → 0.0.47

data/lib/bluepill/process_conditions.rb

@@ -1,5 +1,7 @@
+# -*- encoding: utf-8 -*-
+
 module Bluepill
-  module ProcessConditions    
+  module ProcessConditions
     def self.[](name)
       const_get(name.to_s.camelcase)
     end

data/lib/bluepill/process_conditions/always_true.rb

@@ -1,14 +1,16 @@
+# -*- encoding: utf-8 -*-
+
 module Bluepill
   module ProcessConditions
     class AlwaysTrue < ProcessCondition
       def initialize(options = {})
         @below = options[:below]
       end
-      
+
       def run(pid)
         1
       end
-      
+
       def check(value)
         true
       end

data/lib/bluepill/process_conditions/cpu_usage.rb

@@ -1,15 +1,17 @@
+# -*- encoding: utf-8 -*-
+
 module Bluepill
   module ProcessConditions
     class CpuUsage < ProcessCondition
       def initialize(options = {})
         @below = options[:below]
       end
-      
+
       def run(pid)
         # third col in the ps axu output
         System.cpu_usage(pid).to_f
       end
-      
+
       def check(value)
         value < @below
       end

data/lib/bluepill/process_conditions/http.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'net/http'
 require 'uri'
 

data/lib/bluepill/process_conditions/mem_usage.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 module Bluepill
   module ProcessConditions
     class MemUsage < ProcessCondition
@@ -5,20 +7,20 @@ module Bluepill
       FORMAT_STR = "%d%s"
       MB_LABEL = "MB"
       KB_LABEL = "KB"
-      
+
       def initialize(options = {})
         @below = options[:below]
       end
-      
+
       def run(pid)
         # rss is on the 5th col
         System.memory_usage(pid).to_f
       end
-      
+
       def check(value)
         value.kilobytes < @below
       end
-      
+
       def format_value(value)
         if value.kilobytes >= MB
           FORMAT_STR % [(value / 1024).round, MB_LABEL]

data/lib/bluepill/process_conditions/process_condition.rb

@@ -1,18 +1,20 @@
+# -*- encoding: utf-8 -*-
+
 module Bluepill
   module ProcessConditions
-    class ProcessCondition  
+    class ProcessCondition
       def initialize(options = {})
         @options = options
       end
-      
+
       def run(pid)
         raise "Implement in subclass!"
       end
-      
+
       def check(value)
         raise "Implement in subclass!"
       end
-      
+
       def format_value(value)
         value
       end

data/lib/bluepill/process_statistics.rb

@@ -1,5 +1,7 @@
+# -*- encoding: utf-8 -*-
+
 module Bluepill
-  class ProcessStatistics    
+  class ProcessStatistics
     STRFTIME = "%m/%d/%Y %H:%I:%S"
     # possibly persist this data.
     def initialize

data/lib/bluepill/socket.rb

@@ -1,7 +1,28 @@
+# -*- encoding: utf-8 -*-
+
 require 'socket'
 
+require 'coolio'
+
 module Bluepill
   module Socket
+    class CmdListenerConnection < Coolio::UNIXSocket
+      def initialize(socket, application)
+        @application = application
+        super(socket)
+      end
+
+      def on_read(data)
+        command, *args = data.strip.split(":")
+        response = begin
+          @application.send(command, *args)
+        rescue Exception => e
+          e
+        end
+        write(Marshal.dump(response))
+      end
+    end
+
     TIMEOUT = 10
 
     extend self
@@ -9,7 +30,7 @@ module Bluepill
     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
@@ -20,28 +41,27 @@ module Bluepill
     rescue EOFError, Timeout::Error
       abort("Socket Timeout: Server may not be responding")
     end
-    
-    def server(base_dir, name)
+
+    def server(base_dir, name, application)
       socket_path = self.socket_path(base_dir, name)
       begin
-        UNIXServer.open(socket_path)
+        Coolio::UNIXServer.new(socket_path, CmdListenerConnection, application)
       rescue Errno::EADDRINUSE
-        # if sock file has been created.  test to see if there is a server
+        # if sock file has been created. test to see if there is a server
         begin
           UNIXSocket.open(socket_path)
         rescue Errno::ECONNREFUSED
           File.delete(socket_path)
-          return UNIXServer.open(socket_path)
+          Coolio::UNIXServer.new(socket_path, CmdListenerConnection, application)
         else
           logger.err("Server is already running!")
           exit(7)
         end
       end
     end
-    
+
     def socket_path(base_dir, name)
-      File.join(base_dir, 'socks', name + ".sock") 
+      File.join(base_dir, 'socks', name + ".sock")
     end
   end
 end
- 

data/lib/bluepill/system.rb

@@ -1,12 +1,16 @@
+# -*- encoding: utf-8 -*-
+
 require 'etc'
+require 'shellwords'
 
 module Bluepill
   # This class represents the system that bluepill is running on.. It's mainly used to memoize
   # results of running ps auxx etc so that every watch in the every process will not result in a fork
   module System
     APPEND_MODE = "a"
+    SECONDS_VALID = 2
     extend self
-    
+
     # The position of each field in ps output
     IDX_MAP = {
       :pid => 0,
@@ -14,7 +18,7 @@ module Bluepill
       :pcpu => 2,
       :rss => 3
     }
-    
+
     def pid_alive?(pid)
       begin
         ::Process.kill(0, pid)
@@ -23,23 +27,23 @@ module Bluepill
         false
       end
     end
-    
+
     def cpu_usage(pid)
       ps_axu[pid] && ps_axu[pid][IDX_MAP[:pcpu]].to_f
     end
-    
+
     def memory_usage(pid)
       ps_axu[pid] && ps_axu[pid][IDX_MAP[:rss]].to_f
     end
-    
+
     def get_children(parent_pid)
       child_pids = Array.new
-      ps_axu.each_pair do |pid, chunks| 
+      ps_axu.each_pair do |pid, chunks|
         child_pids << chunks[IDX_MAP[:pid]].to_i if chunks[IDX_MAP[:ppid]].to_i == parent_pid.to_i
       end
       child_pids
     end
-    
+
     # Returns the pid of the child that executes the cmd
     def daemonize(cmd, options = {})
       rd, wr = IO.pipe
@@ -47,76 +51,76 @@ module Bluepill
       if child = Daemonize.safefork
         # we do not wanna create zombies, so detach ourselves from the child exit status
         ::Process.detach(child)
-        
+
         # parent
         wr.close
-        
+
         daemon_id = rd.read.to_i
         rd.close
-          
+
         return daemon_id if daemon_id > 0
-        
+
       else
         # child
         rd.close
 
         drop_privileges(options[:uid], options[:gid])
-        
+
         # if we cannot write the pid file as the provided user, err out
         exit unless can_write_pid_file(options[:pid_file], options[:logger])
-        
+
         to_daemonize = lambda do
           # Setting end PWD env emulates bash behavior when dealing with symlinks
           Dir.chdir(ENV["PWD"] = options[:working_dir]) if options[:working_dir]
           options[:environment].each { |key, value| ENV[key.to_s] = value.to_s } if options[:environment]
-          
+
           redirect_io(*options.values_at(:stdin, :stdout, :stderr))
-          
-          ::Kernel.exec(cmd)
+
+          ::Kernel.exec(*Shellwords.shellwords(cmd))
           exit
         end
 
         daemon_id = Daemonize.call_as_daemon(to_daemonize, nil, cmd)
-                
+
         File.open(options[:pid_file], "w") {|f| f.write(daemon_id)}
-        
-        wr.write daemon_id        
+
+        wr.write daemon_id
         wr.close
 
         exit
       end
     end
-    
+
     # Returns the stdout, stderr and exit code of the cmd
     def execute_blocking(cmd, options = {})
       rd, wr = IO.pipe
-      
+
       if child = Daemonize.safefork
         # parent
         wr.close
-        
+
         cmd_status = rd.read
         rd.close
-        
+
         ::Process.waitpid(child)
-        
+
         return Marshal.load(cmd_status)
-        
+
       else
         # child
         rd.close
-        
+
         # create a child in which we can override the stdin, stdout and stderr
         cmd_out_read, cmd_out_write = IO.pipe
         cmd_err_read, cmd_err_write = IO.pipe
-        
+
         pid = fork {
           # grandchild
           drop_privileges(options[:uid], options[:gid])
-          
+
           Dir.chdir(ENV["PWD"] = options[:working_dir]) if options[:working_dir]
           options[:environment].each { |key, value| ENV[key.to_s] = value.to_s } if options[:environment]
-          
+
           # close unused fds so ancestors wont hang. This line is the only reason we are not
           # using something like popen3. If this fd is not closed, the .read call on the parent
           # will never return because "wr" would still be open in the "exec"-ed cmd
@@ -136,16 +140,16 @@ 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
         cmd_out_write.close
         cmd_err_write.close
-        
+
         # wait for the cmd to finish executing and acknowledge it's death
         ::Process.waitpid(pid)
-        
+
         # collect stdout, stderr and exitcode
         result = {
           :stdout => cmd_out_read.read,
@@ -156,30 +160,24 @@ module Bluepill
         # We're done with these ends of the pipes as well
         cmd_out_read.close
         cmd_err_read.close
-        
+
         # Time to tell the parent about what went down
         wr.write Marshal.dump(result)
         wr.close
 
-        exit  
+        exit
       end
     end
-    
-    def store
-      @store ||= Hash.new
-    end
-    
-    def reset_data
-      store.clear unless store.empty?
-    end
-    
+
     def ps_axu
-      # TODO: need a mutex here
-      store[:ps_axu] ||= begin
+      return @store if @valid_until and @valid_until >= Time.now
+      @valid_until = Time.now + SECONDS_VALID
+
+      @store = begin
         # BSD style ps invocation
         lines = `ps axo pid=,ppid=,pcpu=,rss=`.split("\n")
 
-        lines.inject(Hash.new) do |mem, line| 
+        lines.inject(Hash.new) do |mem, line|
           chunks = line.split(/\s+/)
           chunks.delete_if {|c| c.strip.empty? }
           pid = chunks[IDX_MAP[:pid]].strip.to_i
@@ -188,7 +186,7 @@ module Bluepill
         end
       end
     end
-    
+
     # be sure to call this from a fork otherwise it will modify the attributes
     # of the bluepill daemon
     def drop_privileges(uid, gid)
@@ -201,25 +199,25 @@ module Bluepill
         ::Process::Sys.setuid(uid_num) if uid
       end
     end
-    
+
     def can_write_pid_file(pid_file, logger)
       FileUtils.touch(pid_file)
       File.unlink(pid_file)
       return true
-      
+
     rescue Exception => e
       logger.warning "%s - %s" % [e.class.name, e.message]
       e.backtrace.each {|l| logger.warning l}
       return false
     end
-    
+
     def redirect_io(io_in, io_out, io_err)
       $stdin.reopen(io_in) if io_in
-      
+
       if !io_out.nil? && !io_err.nil? && io_out == io_err
         $stdout.reopen(io_out, APPEND_MODE)
         $stderr.reopen($stdout)
-        
+
       else
         $stdout.reopen(io_out, APPEND_MODE) if io_out
         $stderr.reopen(io_err, APPEND_MODE) if io_err

data/lib/bluepill/trigger.rb

@@ -1,70 +1,72 @@
+# -*- encoding: utf-8 -*-
+
+require 'active_support'
+
 module Bluepill
+  class TriggerTimer < Coolio::TimerWatcher
+    def initialize(trigger, event, delay)
+      @trigger = trigger
+      @event = event
+      super(delay, false)
+    end
+
+    def on_timer
+      begin
+        @trigger.logger.info("Retrying from flapping")
+        @trigger.dispatch!(@event)
+        @trigger.remove_timer(self)
+      rescue StandardError => e
+        @trigger.logger.err(e)
+        @trigger.logger.err(e.backtrace.join("\n"))
+      end
+    end
+  end
+
   class Trigger
     @implementations = {}
     def self.inherited(klass)
       @implementations[klass.name.split('::').last.underscore.to_sym] = klass
     end
-    
+
     def self.[](name)
       @implementations[name]
     end
 
-    attr_accessor :process, :logger, :mutex, :scheduled_events
-    
+    attr_accessor :process, :logger, :scheduled_events
+
     def initialize(process, options = {})
       self.process = process
       self.logger = options[:logger]
-      self.mutex = Mutex.new
       self.scheduled_events = []
     end
-    
+
     def reset!
       self.cancel_all_events
     end
-    
+
     def notify(transition)
       raise "Implement in subclass"
     end
-    
+
     def dispatch!(event)
       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
+
+    def remove_timer(timer)
+      self.scheduled_events.delete(timer)
     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 }
-          end
-        rescue StandardError => e
-          trigger.logger.err(e)
-          trigger.logger.err(e.backtrace.join("\n"))
-        end
-      end
+      timer = Bluepill::TriggerTimer.new(self, event, delay)
+      self.scheduled_events << timer
       
-      self.scheduled_events.push([event, thread])
+      Bluepill::Event.attach(timer)
     end
-    
+
     def cancel_all_events
       self.logger.info "Canceling all scheduled events"
-      self.mutex.synchronize do
-        self.scheduled_events.each {|_, thread| thread.kill}
-      end
+      self.scheduled_events.each {|e| e.detach }
+      self.scheduled_events.clear
     end
-    
   end
 end