heaven 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/heaven/god_watcher.rb

@@ -13,7 +13,7 @@ class GodWatcher # :nodoc:all
     @interval = options[:interval] || 15.seconds
     @grace    = options[:grace]     || 15.seconds
 
-    @behaviors     = options[:behaviors] || [:clean_pid_file]
+    @behaviors     = options[:behaviors] || []
 
     @max_memory = options[:max_memory] || 250.megabytes
     @max_cpu    = options[:max_cpu]    || 50.percent
@@ -22,22 +22,24 @@ class GodWatcher # :nodoc:all
     @check_flapping = options[:check_flapping].nil? ? true : options[:check_flapping]
     @check_memory   = options[:check_memory].nil? ? true : options[:check_memory]
     @check_cpu      = options[:check_cpu].nil? ? true : options[:check_cpu]
+    @check_url      = options[:check_url].nil? ? false : options[:check_url]
 
-    @email_notifications = options[:email_notifications] || false
-    @from_email          = options[:from_email]
-    @from_name           = options[:from_name] || "God"
-    @delivery_method     = options[:delivery_method] || :sendmail
-    @to_emails           = options[:to_emails] || []
+    @email_notifications   = options[:email_notifications] || false
+    @email_from_address    = options[:email_from_address]
+    @email_from_name       = options[:email_from_name] || "God"
+    @email_delivery_method = options[:email_delivery_method] || :sendmail
+    @email_to              = options[:email_to] || []
 
     @campfire_notifications = options[:campfire_notifications] || false
     @campfire_subdomain     = options[:campfire_subdomain]
     @campfire_token         = options[:campfire_token]
     @campfire_room          = options[:campfire_room]
+
+    @url                    = options[:url]
+    @url_timeout            = options[:url_timeout] || 10.seconds
   end
 
   def watch
-    raise HeavenConfigurationError, "start command not specified" if @start.nil?
-    raise HeavenConfigurationError, "stop command not specified" if @stop.nil?
     set_god_defaults unless @god_defaults_set
 
     God.watch do |w|
@@ -48,35 +50,39 @@ class GodWatcher # :nodoc:all
       w.restart  = @restart  if @restart # not mandatory, if we don't specify it god will do a stop and a start
       w.pid_file = @pid_file if @pid_file
       w.log      = @log_file if @log_file
+      w.uid      = @uid if @uid
+      w.gid      = @gid if @gid
 
       w.start_grace   = @grace
       w.restart_grace = @grace
 
       @behaviors.each { |b| w.behavior(b) }
 
-      # determine the state on startup
-      w.transition(:init, { true => :up, false => :start }) do |on|
-	on.condition(:process_running) do |c|
-	  c.running = true
+      unless @check_url
+	# determine the state on startup
+	w.transition(:init, { true => :up, false => :start }) do |on|
+	  on.condition(:process_running) do |c|
+	    c.running = true
+	  end
 	end
-      end
 
-      # determine when process has finished starting
-      w.transition([:start, :restart], :up) do |on|
-	on.condition(:process_running) do |c|
-	  c.running = true
-	end
+	# determine when process has finished starting
+	w.transition([:start, :restart], :up) do |on|
+	  on.condition(:process_running) do |c|
+	    c.running = true
+	  end
 
-	# failsafe
-	on.condition(:tries) do |c|
-	  c.times = @max_times
-	  c.transition = :start
+	  # failsafe
+	  on.condition(:tries) do |c|
+	    c.times = @max_times
+	    c.transition = :start
+	  end
 	end
-      end
 
-      # start if process is not running
-      w.transition(:up, :start) do |on|
-	on.condition(:process_exits)
+	# start if process is not running
+	w.transition(:up, :start) do |on|
+	  on.condition(:process_exits)
+	end
       end
       
       if @check_memory || @check_cpu
@@ -98,15 +104,31 @@ class GodWatcher # :nodoc:all
 	end
       end
 
-      w.lifecycle do |check|
-	check.condition(:flapping) do |c|
-	  c.to_state = [:start, :restart]
-	  c.times    = 5
-	  c.within   = 5.minutes
-	  c.transition = :unmonitored
-	  c.retry_in = 10.minutes
-	  c.retry_times = 5
-	  c.retry_within = 2.hours
+      if @check_url
+	u = URI.parse(@url)
+	w.transition(:up, :restart) do |on|
+	  on.condition(:http_response_code) do |c|        
+	    c.host = u.host
+	    c.port = u.port
+	    c.path = u.path
+	    c.code_is_not = 200        
+	    c.timeout = @url_timeout
+	    c.times = @max_times
+	  end    
+	end
+      end
+
+      if @check_flapping
+	w.lifecycle do |check|
+	  check.condition(:flapping) do |c|
+	    c.to_state = [:start, :restart]
+	    c.times    = 5
+	    c.within   = 5.minutes
+	    c.transition = :unmonitored
+	    c.retry_in = 10.minutes
+	    c.retry_times = 5
+	    c.retry_within = 2.hours
+	  end
 	end
       end
     end
@@ -117,12 +139,12 @@ class GodWatcher # :nodoc:all
 
     if @email_notifications
       God::Contacts::Email.defaults do |d|
-	d.from_email = @from_email
-	d.from_name =  @from_name
-	d.delivery_method = @delivery_method
+	d.from_email = @email_from_address
+	d.from_name =  @email_from_name
+	d.delivery_method = @email_delivery_method
       end
 
-      @to_emails.each do |email|
+      @email_to.each do |email|
 	God.contact(:email) do |c|
 	  c.name     = email
 	  c.to_email = email
@@ -140,4 +162,8 @@ class GodWatcher # :nodoc:all
     end
     @god_defaults_set = true
   end
+
+  def enforce(var, msg)
+    raise HeavenConfigurationError.new(msg) if var.blank?
+  end
 end

data/lib/heaven/heaven.rb

@@ -25,13 +25,17 @@ class Heaven
     # max_memory:: restart the service if its memory usage exceeds this much on [max_times] consecutive polls (default: 250.megabytes)
     # max_cpu::    restart the service if its cpu usage exceeds this much on [max_times] consecutive polls (default: 50.percent)
     # max_times::  see the above (default: 5)
-    def defaults(options)
-      @defaults = options
+    def defaults(options=nil)
+      if options.nil?
+	@defaults || {}
+      else
+	@defaults = options
+      end
     end
 
     # Watch a run-of-the-mill UNIX daemon
     #
-    # It has all the options available to defaults *and*:
+    # It takes all the options available to defaults *and*:
     # script:: name of the daemon's command script (it must take options stop, start and restart)
     def watch_daemon(name, options = {})
       script = options.delete(:script)
@@ -41,7 +45,52 @@ class Heaven
 	options[:restart] = "#{script} restart"
       end
 	
-      GodWatcher.new(name, @defaults.merge(options)).watch
+      GodWatcher.new(name, defaults.merge(options)).watch
+    end
+
+    # Watch a mongrel Rails app
+    #
+    # It takes all the options available to defaults *and*:
+    #
+    # env:: environment to run under
+    # root:: application's root dir (e.g. /var/rails/myapp/current)
+    # pid_prefix:: the prefix of the pid file (takes something like tmp/pids/yourapp and looks for pids like tmp/pids/yourapp.12345.pid)
+    # log_prefix:: the prefix of the mongrel log file (takes something like log/yourapp and looks for logs like log/yourapp.12345.log)
+    # ports:: a list of ports the mongrels run on
+    def watch_mongrel(name, options = {})
+      env = options.delete(:env)
+      root = options.delete(:root)
+      pid_prefix = options.delete(:pid_prefix)
+      log_prefix = options.delete(:log_prefix)
+      ports = options.delete(:ports)
+
+      ports.each do |port|
+	mongrel_hash = { 
+	  :start => "mongrel_rails start -d -e #{env} -c #{root} -p #{port} -P #{root}/#{pid_prefix}.#{port}.pid -l #{root}/#{log_prefix}.#{port}.log",
+	  :stop  => "mongrel_rails stop               -c #{root} -p #{port} -P #{root}/#{pid_prefix}.#{port}.pid",
+	  :pid_file => "/var/rails/lessmemories/current/log/mongrel.#{port}.pid"
+	}
+	GodWatcher.new("#{name}-#{env}-#{port}", defaults.merge(mongrel_hash).merge(options)).watch
+      end
+    end
+
+    # Watch a URL
+    #
+    # It takes all the options available to defaults *and*:
+    #
+    # url:: the url to watch
+    # url_timeout:: how long to wait for a status
+    #
+    # Note that the start and stop options are ignored, this just restarts the service
+    def watch_url(name, options = {})
+      options[:check_cpu] = false
+      options[:check_memory] = false
+      options[:check_flapping] = false
+      options[:check_url] = true
+
+      options[:start] = ""
+      options[:stop]  = ""
+      GodWatcher.new(name, defaults.merge(options)).watch
     end
   end
 end

data/lib/heaven.rb

@@ -1,2 +1,4 @@
+require 'uri'
+
 require 'heaven/heaven'
 require 'heaven/god_watcher'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heaven
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Eugen Minciu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 +03:00
+date: 2011-08-20 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency