god 0.8.0 → 0.9.0

data/History.txt

@@ -1,3 +1,17 @@
+== 0.9.0 / 2010-04-03
+  * Minor Enhancements
+    * Allow kqueue for OpenBSD and NetBSD
+    * Add err_log and err_log_cmd
+    * Add God.terminate_timeout option
+    * Respect --log-level in Syslog
+    * Add configuration parameters to set permissions on socket
+    * Add Scout contact
+    * Add Prowl contact
+  * Bug Fixes
+    * Fix interleaved log messages
+  * Experimental
+    * Ruby 1.9 support
+
 == 0.8.0 / 2009-11-30
   * Minor Enhancements
     * Rubygems decontamination

data/Rakefile

@@ -1,24 +1,10 @@
 require 'rubygems'
 require 'rake'
+require 'date'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "god"
-    gem.rubyforge_project = "god"
-    gem.summary = 'Like monit, only awesome'
-    gem.description = "God is an easy to configure, easy to extend monitoring framework written in Ruby."
-    gem.email = "tom@mojombo.com"
-    gem.homepage = "http://god.rubyforge.org/"
-    gem.authors = ["Tom Preston-Werner"]
-    gem.require_paths = ["lib", "ext"]
-    gem.files.include("ext")
-    gem.extensions << 'ext/god/extconf.rb'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+def source_version
+  line = File.read('lib/god.rb')[/^\s*VERSION = .*/]
+  line.match(/.*VERSION = '(.*)'/)[1]
 end
 
 require 'rake/testtask'
@@ -54,15 +40,45 @@ end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "god #{version}"
+  rdoc.title = "god #{source_version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+if defined?(Gem)
+  task :release => :build do
+    sh "git commit --allow-empty -a -m 'up to #{source_version}'"
+    sh "git tag v#{source_version}"
+    sh "git push origin master"
+    sh "gem push pkg/god-#{source_version}.gem"
+  end
+
+  task :build => :gemspec do
+    sh 'mkdir -p pkg'
+    sh 'gem build god.gemspec'
+    sh 'mv *.gem pkg'
+  end
+
+  task :gemspec do
+    # read spec file and split out manifest section
+    spec = File.read('god.gemspec')
+    head, manifest, tail = spec.split("  # = MANIFEST =\n")
+    # replace version and date
+    head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
+    head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
+    # determine file list from git ls-files
+    files = `git ls-files`.
+      split("\n").
+      sort.
+      reject { |file| file =~ /^\./ }.
+      reject { |file| file =~ /^(ideas|init|site)/ }.
+      map { |file| "    #{file}" }.
+      join("\n")
+    # piece file back together and write...
+    manifest = "  s.files = %w[\n#{files}\n  ]\n"
+    spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+    File.open('god.gemspec', 'w') { |io| io.write(spec) }
+    puts "updated god.gemspec"
+  end
 end

data/ext/god/kqueue_handler.c

@@ -1,4 +1,4 @@
-#if defined(__FreeBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
 
 #include <ruby.h>
 #include <sys/event.h>
@@ -41,6 +41,8 @@ kqh_monitor_process(VALUE klass, VALUE pid, VALUE mask)
 {
   struct kevent new_event;
   ID event;
+
+  (void)event;      //!< Silence warning about unused var, should be removed?
   
   u_int fflags = NUM2UINT(mask);
   
@@ -48,7 +50,7 @@ kqh_monitor_process(VALUE klass, VALUE pid, VALUE mask)
          EV_ADD | EV_ENABLE, fflags, 0, 0);
   
   if (-1 == kevent(kq, &new_event, 1, NULL, 0, NULL)) {
-    rb_raise(rb_eStandardError, strerror(errno));
+    rb_raise(rb_eStandardError, "%s", strerror(errno));
   }
   
   num_events = NUM_EVENTS;
@@ -74,14 +76,14 @@ kqh_handle_events()
   events = (struct kevent*)malloc(num_to_fetch * sizeof(struct kevent));
   
   if (NULL == events) {
-    rb_raise(rb_eStandardError, strerror(errno));
+    rb_raise(rb_eStandardError, "%s", strerror(errno));
   }
   
   nevents = kevent(kq, NULL, 0, events, num_to_fetch, NULL);
   
   if (-1 == nevents) {
     free(events);
-    rb_raise(rb_eStandardError, strerror(errno));
+    rb_raise(rb_eStandardError, "%s", strerror(errno));
   } else {
     for (i = 0; i < nevents; i++) {
       if (events[i].fflags & NOTE_EXIT) {

data/ext/god/netlink_handler.c

@@ -37,7 +37,7 @@ nlh_handle_events()
   FD_SET(nl_sock, &fds);
     
   if (0 > rb_thread_select(nl_sock + 1, &fds, NULL, NULL, NULL)) {
-    rb_raise(rb_eStandardError, strerror(errno));
+    rb_raise(rb_eStandardError, "%s", strerror(errno));
   }
   
   /* If there were no events detected, return */
@@ -47,13 +47,13 @@ nlh_handle_events()
   
   /* if there are events, make calls */  
   if (-1 == recv(nl_sock, buff, sizeof(buff), 0)) {
-    rb_raise(rb_eStandardError, strerror(errno));
+    rb_raise(rb_eStandardError, "%s", strerror(errno));
   }
   
   hdr = (struct nlmsghdr *)buff;
   
   if (NLMSG_ERROR == hdr->nlmsg_type) {
-    rb_raise(rb_eStandardError, strerror(errno));
+    rb_raise(rb_eStandardError, "%s", strerror(errno));
   } else if (NLMSG_DONE == hdr->nlmsg_type) {    
     
     event = (struct proc_event *)((struct cn_msg *)NLMSG_DATA(hdr))->data;
@@ -114,7 +114,7 @@ connect_to_netlink()
   nl_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
   
   if (-1 == nl_sock) {
-    rb_raise(rb_eStandardError, strerror(errno));
+    rb_raise(rb_eStandardError, "%s", strerror(errno));
   }
   
   bzero(&sa_nl, sizeof(sa_nl));
@@ -123,7 +123,7 @@ connect_to_netlink()
   sa_nl.nl_pid    = getpid();
   
   if (-1 == bind(nl_sock, (struct sockaddr *)&sa_nl, sizeof(sa_nl))) {
-    rb_raise(rb_eStandardError, strerror(errno));
+    rb_raise(rb_eStandardError, "%s", strerror(errno));
   }
   
   /* Fill header */
@@ -145,7 +145,7 @@ connect_to_netlink()
   *(int*)msg->data = PROC_CN_MCAST_LISTEN;
   
   if (-1 == send(nl_sock, hdr, hdr->nlmsg_len, 0)) {
-    rb_raise(rb_eStandardError, strerror(errno));
+    rb_raise(rb_eStandardError, "%s", strerror(errno));
   }
 }
 

data/god.gemspec

@@ -1,11 +1,6 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{god}
-  s.version = "0.8.0"
+  s.version = '0.9.0'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
@@ -18,152 +13,133 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = [
     "README.txt"
   ]
-  s.files = [
-    ".gitignore",
-     "Announce.txt",
-     "History.txt",
-     "README.txt",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/god",
-     "examples/events.god",
-     "examples/gravatar.god",
-     "examples/single.god",
-     "ext/god/.gitignore",
-     "ext/god/extconf.rb",
-     "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",
-     "lib/god/behaviors/clean_unix_socket.rb",
-     "lib/god/behaviors/notify_when_flapping.rb",
-     "lib/god/cli/command.rb",
-     "lib/god/cli/run.rb",
-     "lib/god/cli/version.rb",
-     "lib/god/condition.rb",
-     "lib/god/conditions/always.rb",
-     "lib/god/conditions/complex.rb",
-     "lib/god/conditions/cpu_usage.rb",
-     "lib/god/conditions/degrading_lambda.rb",
-     "lib/god/conditions/disk_usage.rb",
-     "lib/god/conditions/file_mtime.rb",
-     "lib/god/conditions/flapping.rb",
-     "lib/god/conditions/http_response_code.rb",
-     "lib/god/conditions/lambda.rb",
-     "lib/god/conditions/memory_usage.rb",
-     "lib/god/conditions/process_exits.rb",
-     "lib/god/conditions/process_running.rb",
-     "lib/god/conditions/tries.rb",
-     "lib/god/configurable.rb",
-     "lib/god/contact.rb",
-     "lib/god/contacts/campfire.rb",
-     "lib/god/contacts/email.rb",
-     "lib/god/contacts/jabber.rb",
-     "lib/god/contacts/twitter.rb",
-     "lib/god/contacts/webhook.rb",
-     "lib/god/dependency_graph.rb",
-     "lib/god/diagnostics.rb",
-     "lib/god/driver.rb",
-     "lib/god/errors.rb",
-     "lib/god/event_handler.rb",
-     "lib/god/event_handlers/dummy_handler.rb",
-     "lib/god/event_handlers/kqueue_handler.rb",
-     "lib/god/event_handlers/netlink_handler.rb",
-     "lib/god/logger.rb",
-     "lib/god/metric.rb",
-     "lib/god/process.rb",
-     "lib/god/registry.rb",
-     "lib/god/simple_logger.rb",
-     "lib/god/socket.rb",
-     "lib/god/sugar.rb",
-     "lib/god/system/portable_poller.rb",
-     "lib/god/system/process.rb",
-     "lib/god/system/slash_proc_poller.rb",
-     "lib/god/task.rb",
-     "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",
-     "test/configs/child_polls/simple_server.rb",
-     "test/configs/complex/complex.god",
-     "test/configs/complex/simple_server.rb",
-     "test/configs/contact/contact.god",
-     "test/configs/contact/simple_server.rb",
-     "test/configs/daemon_events/daemon_events.god",
-     "test/configs/daemon_events/simple_server.rb",
-     "test/configs/daemon_events/simple_server_stop.rb",
-     "test/configs/daemon_polls/daemon_polls.god",
-     "test/configs/daemon_polls/simple_server.rb",
-     "test/configs/degrading_lambda/degrading_lambda.god",
-     "test/configs/degrading_lambda/tcp_server.rb",
-     "test/configs/lifecycle/lifecycle.god",
-     "test/configs/matias/matias.god",
-     "test/configs/real.rb",
-     "test/configs/running_load/running_load.god",
-     "test/configs/stress/simple_server.rb",
-     "test/configs/stress/stress.god",
-     "test/configs/task/logs/.placeholder",
-     "test/configs/task/task.god",
-     "test/configs/test.rb",
-     "test/helper.rb",
-     "test/suite.rb",
-     "test/test_behavior.rb",
-     "test/test_campfire.rb",
-     "test/test_condition.rb",
-     "test/test_conditions_disk_usage.rb",
-     "test/test_conditions_http_response_code.rb",
-     "test/test_conditions_process_running.rb",
-     "test/test_conditions_tries.rb",
-     "test/test_contact.rb",
-     "test/test_dependency_graph.rb",
-     "test/test_driver.rb",
-     "test/test_email.rb",
-     "test/test_event_handler.rb",
-     "test/test_god.rb",
-     "test/test_handlers_kqueue_handler.rb",
-     "test/test_jabber.rb",
-     "test/test_logger.rb",
-     "test/test_metric.rb",
-     "test/test_process.rb",
-     "test/test_registry.rb",
-     "test/test_socket.rb",
-     "test/test_sugar.rb",
-     "test/test_system_portable_poller.rb",
-     "test/test_system_process.rb",
-     "test/test_task.rb",
-     "test/test_timeline.rb",
-     "test/test_trigger.rb",
-     "test/test_watch.rb",
-     "test/test_webhook.rb"
+  # = MANIFEST =
+  s.files = %w[
+    Announce.txt
+    History.txt
+    README.txt
+    Rakefile
+    bin/god
+    examples/events.god
+    examples/gravatar.god
+    examples/single.god
+    ext/god/.gitignore
+    ext/god/extconf.rb
+    ext/god/kqueue_handler.c
+    ext/god/netlink_handler.c
+    god.gemspec
+    lib/god.rb
+    lib/god/behavior.rb
+    lib/god/behaviors/clean_pid_file.rb
+    lib/god/behaviors/clean_unix_socket.rb
+    lib/god/behaviors/notify_when_flapping.rb
+    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
+    lib/god/conditions/cpu_usage.rb
+    lib/god/conditions/degrading_lambda.rb
+    lib/god/conditions/disk_usage.rb
+    lib/god/conditions/file_mtime.rb
+    lib/god/conditions/flapping.rb
+    lib/god/conditions/http_response_code.rb
+    lib/god/conditions/lambda.rb
+    lib/god/conditions/memory_usage.rb
+    lib/god/conditions/process_exits.rb
+    lib/god/conditions/process_running.rb
+    lib/god/conditions/tries.rb
+    lib/god/configurable.rb
+    lib/god/contact.rb
+    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
+    lib/god/diagnostics.rb
+    lib/god/driver.rb
+    lib/god/errors.rb
+    lib/god/event_handler.rb
+    lib/god/event_handlers/dummy_handler.rb
+    lib/god/event_handlers/kqueue_handler.rb
+    lib/god/event_handlers/netlink_handler.rb
+    lib/god/logger.rb
+    lib/god/metric.rb
+    lib/god/process.rb
+    lib/god/registry.rb
+    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
+    lib/god/task.rb
+    lib/god/timeline.rb
+    lib/god/trigger.rb
+    lib/god/watch.rb
+    test/configs/child_events/child_events.god
+    test/configs/child_events/simple_server.rb
+    test/configs/child_polls/child_polls.god
+    test/configs/child_polls/simple_server.rb
+    test/configs/complex/complex.god
+    test/configs/complex/simple_server.rb
+    test/configs/contact/contact.god
+    test/configs/contact/simple_server.rb
+    test/configs/daemon_events/daemon_events.god
+    test/configs/daemon_events/simple_server.rb
+    test/configs/daemon_events/simple_server_stop.rb
+    test/configs/daemon_polls/daemon_polls.god
+    test/configs/daemon_polls/simple_server.rb
+    test/configs/degrading_lambda/degrading_lambda.god
+    test/configs/degrading_lambda/tcp_server.rb
+    test/configs/lifecycle/lifecycle.god
+    test/configs/matias/matias.god
+    test/configs/real.rb
+    test/configs/running_load/running_load.god
+    test/configs/stress/simple_server.rb
+    test/configs/stress/stress.god
+    test/configs/task/logs/.placeholder
+    test/configs/task/task.god
+    test/configs/test.rb
+    test/helper.rb
+    test/suite.rb
+    test/test_behavior.rb
+    test/test_campfire.rb
+    test/test_condition.rb
+    test/test_conditions_disk_usage.rb
+    test/test_conditions_http_response_code.rb
+    test/test_conditions_process_running.rb
+    test/test_conditions_tries.rb
+    test/test_contact.rb
+    test/test_dependency_graph.rb
+    test/test_driver.rb
+    test/test_email.rb
+    test/test_event_handler.rb
+    test/test_god.rb
+    test/test_handlers_kqueue_handler.rb
+    test/test_jabber.rb
+    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
+    test/test_system_portable_poller.rb
+    test/test_system_process.rb
+    test/test_task.rb
+    test/test_timeline.rb
+    test/test_trigger.rb
+    test/test_watch.rb
+    test/test_webhook.rb
   ]
+  # = MANIFEST =
   s.homepage = %q{http://god.rubyforge.org/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib", "ext"]