god 0.8.0 → 0.9.0

data/lib/god/sys_logger.rb

@@ -0,0 +1,45 @@
+begin
+  require 'syslog'
+
+  # Ensure that Syslog is open
+  begin
+    Syslog.open('god')
+  rescue RuntimeError
+    Syslog.reopen('god')
+  end
+
+  Syslog.info("Syslog enabled.")
+
+  module God
+
+    class SysLogger
+      SYMBOL_EQUIVALENTS = { :fatal => Syslog::LOG_CRIT,
+                             :error => Syslog::LOG_ERR,
+                             :warn => Syslog::LOG_WARNING,
+                             :info => Syslog::LOG_INFO,
+                             :debug => Syslog::LOG_DEBUG }
+
+      # Set the log level
+      #   +level+ is the Symbol level to set as maximum. One of:
+      #           [:fatal | :error | :warn | :info | :debug ]
+      #
+      # Returns Nothing
+      def self.level=(level)
+        Syslog.mask = Syslog::LOG_UPTO(SYMBOL_EQUIVALENTS[level])
+      end
+
+      # Log a message to syslog.
+      #   +level+ is the Symbol level of the message. One of:
+      #           [:fatal | :error | :warn | :info | :debug ]
+      #   +text+ is the String text of the message
+      #
+      # Returns Nothing
+      def self.log(level, text)
+        Syslog.log(SYMBOL_EQUIVALENTS[level], text)
+      end
+    end
+
+  end
+rescue Object => e
+  puts "Syslog could not be enabled: #{e.message}"
+end

data/lib/god/watch.rb

@@ -13,7 +13,8 @@ module God
     extend Forwardable
     def_delegators :@process, :name, :uid, :gid, :start, :stop, :restart, :dir,
                               :name=, :uid=, :gid=, :start=, :stop=, :restart=, :dir=,
-                              :pid_file, :pid_file=, :log, :log=, :log_cmd, :log_cmd=, :alive?, :pid,
+                              :pid_file, :pid_file=, :log, :log=, :log_cmd, :log_cmd=,
+                              :err_log, :err_log=, :err_log_cmd, :err_log_cmd=, :alive?, :pid,
                               :unix_socket, :unix_socket=, :chroot, :chroot=, :env, :env=, :signal
     # 
     def initialize

data/test/configs/contact/contact.god

@@ -36,6 +36,12 @@ God.contact(:twitter) do |c|
   c.group     = 'developers'
 end
 
+God.contact(:prowl) do |c|
+  c.name = 'tom3'
+  c.apikey = 'd31c1f31f7af0f69e263c2f12167263127eab608'
+  c.group = 'developers'
+end
+
 God.watch do |w|
   w.name = "contact"
   w.interval = 5.seconds
@@ -65,7 +71,7 @@ God.watch do |w|
   # start if process is not running
   w.transition(:up, :start) do |on|
     on.condition(:process_exits) do |c|
-      c.notify = {:contacts => ['tom2', 'foobar'], :priority => 1, :category => 'product'}
+      c.notify = {:contacts => ['tom2', 'tom3', 'foobar'], :priority => 1, :category => 'product'}
     end
   end
   

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require File.join(File.dirname(__FILE__), *%w[.. lib god sys_logger])
 require File.join(File.dirname(__FILE__), *%w[.. lib god])
 God::EventHandler.load
 
@@ -122,7 +123,7 @@ end
 class Object
   class Bypass
     instance_methods.each do |m|
-      undef_method m unless m =~ /^__/
+      undef_method m unless m =~ /^(__|object_id)/
     end
 
     def initialize(ref)

data/test/test_behavior.rb

@@ -12,7 +12,7 @@ class TestBehavior < Test::Unit::TestCase
   end
   
   def test_complain
-    Syslog.expects(:err).with('foo')
+    SysLogger.expects(:log).with(:error, 'foo')
     assert !Behavior.allocate.bypass.complain('foo')
   end
 end

data/test/test_logger.rb

@@ -19,7 +19,7 @@ class TestLogger < Test::Unit::TestCase
   end
   
   def test_log_should_send_to_syslog
-    Syslog.expects(:crit).with('foo')
+    SysLogger.expects(:log).with(:fatal, 'foo')
     @log.log(stub(:name => 'foo'), :fatal, "foo")
   end
   

data/test/test_prowl.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/helper'
+
+class TestProwl < Test::Unit::TestCase
+  def test_live_notify
+    prowl = God::Contacts::Prowl.new
+    prowl.name = "Prowly"
+    prowl.apikey = 'put_your_apikey_here'
+
+    Prowly.expects(:notify).returns(mock(:succeeded? => true))
+
+    prowl.notify("Test", Time.now, "Test", "Test", "")
+    assert_equal "sent prowl notification to #{prowl.name}", prowl.info
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -23,12 +23,10 @@ extensions:
 extra_rdoc_files: 
 - README.txt
 files: 
-- .gitignore
 - Announce.txt
 - History.txt
 - README.txt
 - Rakefile
-- VERSION.yml
 - bin/god
 - examples/events.god
 - examples/gravatar.god
@@ -38,13 +36,6 @@ files:
 - ext/god/kqueue_handler.c
 - ext/god/netlink_handler.c
 - god.gemspec
-- ideas/execve/.DS_Store
-- ideas/execve/execve.c
-- ideas/execve/extconf.rb
-- ideas/execve/go.rb
-- ideas/future.god
-- init/god
-- init/lsb_compliant_god
 - lib/god.rb
 - lib/god/behavior.rb
 - lib/god/behaviors/clean_pid_file.rb
@@ -53,6 +44,7 @@ files:
 - lib/god/cli/command.rb
 - lib/god/cli/run.rb
 - lib/god/cli/version.rb
+- lib/god/compat19.rb
 - lib/god/condition.rb
 - lib/god/conditions/always.rb
 - lib/god/conditions/complex.rb
@@ -72,6 +64,8 @@ files:
 - lib/god/contacts/campfire.rb
 - lib/god/contacts/email.rb
 - lib/god/contacts/jabber.rb
+- lib/god/contacts/prowl.rb
+- lib/god/contacts/scout.rb
 - lib/god/contacts/twitter.rb
 - lib/god/contacts/webhook.rb
 - lib/god/dependency_graph.rb
@@ -89,6 +83,7 @@ files:
 - lib/god/simple_logger.rb
 - lib/god/socket.rb
 - lib/god/sugar.rb
+- lib/god/sys_logger.rb
 - lib/god/system/portable_poller.rb
 - lib/god/system/process.rb
 - lib/god/system/slash_proc_poller.rb
@@ -96,23 +91,6 @@ files:
 - lib/god/timeline.rb
 - lib/god/trigger.rb
 - lib/god/watch.rb
-- site/images/banner.jpg
-- site/images/bg.gif
-- site/images/bg_grey.gif
-- site/images/bullet.jpg
-- site/images/corner_green.gif
-- site/images/corner_green.psd
-- site/images/corner_pink.gif
-- site/images/god_logo.png
-- site/images/header_bg.gif
-- site/images/header_bg.jpg
-- site/images/red_dot.gif
-- site/images/top_bg.gif
-- site/index.html
-- site/install.html
-- site/javascripts/code_highlighter.js
-- site/javascripts/ruby.js
-- site/stylesheets/layout.css
 - test/configs/child_events/child_events.god
 - test/configs/child_events/simple_server.rb
 - test/configs/child_polls/child_polls.god
@@ -157,6 +135,7 @@ files:
 - test/test_logger.rb
 - test/test_metric.rb
 - test/test_process.rb
+- test/test_prowl.rb
 - test/test_registry.rb
 - test/test_socket.rb
 - test/test_sugar.rb

data/.gitignore

@@ -1,8 +0,0 @@
-coverage
-pkg
-*.log
-logs
-*.rbc
-*~
-.*.sw?
-.DS_Store

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:major: 0
-:minor: 8
-:build: 
-:patch: 0

data/ideas/execve/execve.c

@@ -1,29 +0,0 @@
-#include "ruby.h"
-
-static VALUE mKernel;
-void Init_execve();
-VALUE method_execve(VALUE self, VALUE cmd, VALUE env);
-
-void Init_execve() {
-  mKernel = rb_const_get(rb_cObject, rb_intern("Kernel"));
-  rb_define_method(mKernel, "execve", method_execve, 2);
-}
-
-VALUE method_execve(VALUE self, VALUE r_cmd, VALUE r_env) {
-  char *shell = (char *)dln_find_exe("sh", 0);
-  char *arg[] = { "sh", "-c", StringValuePtr(r_cmd), (char *)0 };
-  
-  struct RArray *env_array;
-  env_array = RARRAY(r_env);
-  char *env[env_array->len + 1];
-  
-  int i;
-  for(i = 0; i < env_array->len; i++) {
-    env[i] = StringValuePtr(env_array->ptr[i]);
-  }
-  
-  env[env_array->len] = (char *)0;
-  
-  execve(shell, arg, env);
-  return Qnil;
-}

data/ideas/execve/extconf.rb

@@ -1,11 +0,0 @@
-# Loads mkmf which is used to make makefiles for Ruby extensions
-require 'mkmf'
-
-# Give it a name
-extension_name = 'execve'
-
-# The destination
-dir_config(extension_name)
-
-# Do the work
-create_makefile(extension_name)

data/ideas/execve/go.rb

@@ -1,8 +0,0 @@
-require 'execve'
-
-my_env = ENV.to_hash.merge('HOME' => '/foo')
-# my_env = ENV.to_hash
-
-env = my_env.keys.inject([]) { |acc, k| acc << "#{k}=#{my_env[k]}"; acc }
-
-execve(%Q{ruby -e "puts ENV['HOME']"}, env)

data/ideas/future.god

@@ -1,82 +0,0 @@
-# This example shows how you might keep a local development Rails server up
-# and running on your Mac.
-
-# Run with:
-# god -c /path/to/events.god
-
-RAILS_ROOT = "/Users/tom/dev/helloworld"
-
-God::Contacts::Email.delivery_method = :smtp
-God::Contacts::Email.server_settings = {}
-
-God.contact(:email) do |c|
-  c.name = 'tom'
-  c.email = 'tom@powerset.com'
-  c.group = 'developers'
-  c.throttle = 30.minutes
-end
-
-God.watch do |w|
-  w.name = "local-3000"
-  w.interval = 5.seconds
-  w.start = "mongrel_rails start -P ./log/mongrel.pid -c #{RAILS_ROOT} -d"
-  w.stop = "mongrel_rails stop -P ./log/mongrel.pid -c #{RAILS_ROOT}"
-  w.pid_file = File.join(RAILS_ROOT, "log/mongrel.pid")
-  
-  # clean pid files before start if necessary
-  w.behavior(:clean_pid_file)
-  
-  # 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
-  
-  # determine when process has finished starting
-  w.transition([:start, :restart], :up) do |on|
-    on.condition(:process_running) do |c|
-      c.running = true
-    end
-  end
-
-  # start if process is not running
-  w.transition(:up, :start) do |on|
-    on.condition(:process_exits)
-  end
-  
-  # restart if memory or cpu is too high
-  w.transition(:up, :restart) do |on|
-    on.condition(:memory_usage) do |c|
-      c.interval = 20
-      c.above = 50.megabytes
-      c.times = [3, 5]
-    end
-    
-    on.condition(:cpu_usage) do |c|
-      c.interval = 10
-      c.above = 10.percent
-      c.times = [3, 5]
-    end
-  end
-  
-  # lifecycle
-  w.lifecycle do |on|
-    on.condition(:flapping) do |c|
-      c.to_state = [:start, :restart]
-      c.times = 5
-      c.within = 30.seconds
-      c.transition = nil
-      c.retry = 60.seconds
-      c.giveup_tries = 5
-      c.notify = 'tom'
-    end
-    
-    on.condition(:memory_usage) do |c|
-      c.interval = 20
-      c.above = 40.megabytes
-      c.times = [3, 5]
-      c.notify = 'tom'
-    end
-  end
-end

data/init/god

@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# god       Startup script for god (http://god.rubyforge.org)
-#
-# chkconfig: - 85 15
-# description: God is an easy to configure, easy to extend monitoring \
-#              framework written in Ruby.
-#              
-
-CONF_DIR=/etc/god
-
-RETVAL=0
-
-# Go no further if config directory is missing.
-[ -d "$CONF_DIR" ] || exit 0
-
-case "$1" in
-    start)
-      # Create pid directory
-      ruby /usr/bin/god -c $CONF_DIR/master.conf
-      RETVAL=$?
-  ;;
-    stop)
-      ruby /usr/bin/god terminate
-      RETVAL=$?
-  ;;
-    restart)
-      ruby /usr/bin/god terminate
-      ruby /usr/bin/god -c $CONF_DIR/master.conf
-      RETVAL=$?
-  ;;
-    status)
-      ruby /usr/bin/god status
-      RETVAL=$?
-  ;;
-    *)
-      echo "Usage: god {start|stop|restart|status}"
-      exit 1
-  ;;
-esac      
-
-exit $RETVAL

data/init/lsb_compliant_god

@@ -1,109 +0,0 @@
-#!/usr/bin/env ruby
-
-# see http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
-
-PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
-DESC="god daemon"
-NAME="god"
-DAEMON="/usr/bin/#{NAME}"
-CONFIGFILE="/etc/god/god.conf"
-PIDFILE="/var/run/#{NAME}.pid"
-SCRIPTNAME="/etc/init.d/#{NAME}"
-START_FLAGS="--no-syslog -P #{PIDFILE}"
-
-ENV["PATH"] = PATH
-
-def read_pid
-  begin
-    @pid = File.read(PIDFILE).to_i
-    @pid = nil if @pid == 0
-  rescue
-    @pid = nil
-  end
-end
-
-def kill(code)
-  Process.kill(code, @pid)
-  true
-rescue
-  false
-end
-
-def running?
-  @pid && kill(0)
-end
-
-def dead?
-  @pid && !kill(0)
-end
-
-def start
-  if running?
-    puts "already running (#{@pid})"
-    exit
-  end
-
-  if dead?
-    clean_pid
-  end
-
-  puts "starting #{NAME}"
-  system("#{DAEMON} -c #{CONFIGFILE} #{START_FLAGS}")
-end
-
-def stop
-  if not running?
-    puts "not running"
-    exit
-  end
-
-	system("god quit")
-end
-
-def restart
-	if running?
-		stop
-		read_pid
-	end
-	start
-end
-
-def force_reload
-	if running?
-	  restart
-	end
-end
-
-def clean_pid
-  File.delete(PIDFILE)
-end
-
-read_pid
-case ARGV[0]
-when 'start'
-  start
-when 'stop'
-  stop
-when 'restart'
-  if not running?
-    start
-  else
-    restart
-  end
-when 'force-reload'
-  force_reload
-when 'status'
-  if running?
-    puts "running (#{@pid})"
-  elsif dead?
-    puts "dead (#{@pid})"
-    exit!(1)
-  else
-    puts "not running"
-    exit!(3)
-  end
-else
-  puts "Usage: #{SCRIPTNAME} start|stop|restart|force-reload|status"
-end
-
-exit