godhead 0.0.4 → 0.0.5

data/.gitignore

@@ -41,3 +41,5 @@ a.out
 /config/sphinx.yml
 /public/stylesheets/compiled/*
 /vendor/src/**/*
+*.gem
+*.gemspec

data/README.textile

@@ -34,7 +34,7 @@ The @examples/@ directory holds:
 
 h2. Our use case for godhead
 
-At infochimps, we have a lot of boxen set up as "scrapers":http://github.com/mrflip/monkeyshines and as "feed endpoints.":http://github.com/mrflip/flood_monkey These typically talk to a lightweight database of some sort, pull or push to a queue, and are controlled through a simple sinatra admin panel.
+At infochimps, we have a lot of boxen set up as "scrapers":http://github.com/infochimps/monkeyshines and as "feed endpoints.":http://github.com/mrflip/flood_monkey These typically talk to a lightweight database of some sort, pull or push to a queue, and are controlled through a simple sinatra admin panel.
 
 With Godhead we describe the platonic form of, say, a "god config to monitor Tokyo Tyrant".  The god files for a project using Tokyo Tyrant specifies only those few ways (port numbers, memory limits, etc) that its tasks differ from any other project's Tokyo Tyrant tasks. Configuration is still done in Ruby, through any combination of config params and subclassing.
 
@@ -47,4 +47,4 @@ h2. Links
 ** "god recipe":http://pastie.textmate.org/private/ovgxu2ihoicli2ktrwtbew 
 * "delayed_job":http://github.com/blog/229-dj-god
 * "init.d/god script":http://www.johnwulff.com/2008/04/30/deploy-typo-using-capistrano
-* backgroundRb: "this one":http://effectif.com/articles/monitoring-backgroundrb-with-god - or "this one":http://blog.jonathanrwallace.com/2008/08/monitoring-backgroundrb-workers-with-god/
+* backgroundRb: "this one":http://effectif.com/articles/monitoring-backgroundrb-with-god - or "this one":http://blog.jonathanrwallace.com/2008/08/monitoring-backgroundrb-workers-with-god/

data/Rakefile

@@ -7,9 +7,9 @@ begin
     gem.name = "godhead"
     gem.summary = %Q{God recipes that separate configuration for processes, site policy and notifications; comes with many examples}
     gem.description = %Q{Configure God monitored processes according to their concerns the servers (path and so forth), site policy (number, ports, etc), and notification (email groups, mailserver, etc).}
-    gem.email = "flip@infochimps.org"
-    gem.homepage = "http://github.com/mrflip/godhead"
-    gem.authors = ["Philip (flip) Kromer"]
+    gem.email = "coders@infochimps.org"
+    gem.homepage = "http://github.com/infochimps/godhead"
+    gem.authors = ["Philip (flip) Kromer, Dhruv Bansal, Carl Knutson"]
     gem.add_development_dependency "yard", ">= 0"
     gem.add_development_dependency "rspec"
     gem.add_dependency 'god'

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/godhead/god_recipe.rb

@@ -4,6 +4,7 @@ module Godhead
       :monitor_group      => nil,
       :uid                => nil,
       :gid                => nil,
+      :env                => nil,
       :crash_notify       => nil,
       :restart_notify     => nil,
       :flapping_notify    => nil,
@@ -69,6 +70,7 @@ module Godhead
       watcher.pid_file         = pid_file                 if pid_file
       watcher.uid              = options[:uid]            if options[:uid]
       watcher.gid              = options[:gid]            if options[:gid]
+      watcher.env              = options[:env]            if options[:env]
       watcher.interval         = options[:default_interval]
       watcher.start_grace      = options[:start_grace_time]
       watcher.restart_grace    = options[:restart_grace_time] || (options[:start_grace_time] + 2.seconds)

data/lib/godhead/recipes/generic_worker_recipe.rb

@@ -8,7 +8,7 @@ module Godhead
       :max_mem_usage   => 50.megabytes,
       #
       :user            => nil,
-      :runner_path     => nil,
+      :runner_path     => nil
     }
     def self.default_options() super.deep_merge(DEFAULT_OPTIONS) ; end
 
@@ -36,13 +36,13 @@ module Godhead
 
     def start_command
       cmd = [
-        "sudo",
-        (options[:user] ? "-u #{options[:user]}" : nil),
-        options[:runner_path],
-      ].flatten.compact.join(" ")
+             "sudo",
+             (options[:user] ? "-u #{options[:user]}" : nil),
+             options[:runner_path],
+            ].flatten.compact.join(" ")
       p ['worker command', cmd]
       cmd
     end
-
+    
   end
 end

data/lib/godhead/recipes/unicorn_recipe.rb

@@ -36,7 +36,8 @@ module Godhead
 
     # # USR2 causes the master to re-create itself and spawn a new worker pool
     def restart_command
-      "kill -USR2 `cat #{pid_file}`"
+      old_pid_file = pid_file
+      "old_pid=`cat #{old_pid_file}`; kill -USR2 $old_pid ; sleep 4 ; kill -QUIT $old_pid"
     end
   end
 end

metadata

@@ -1,72 +1,59 @@
 --- !ruby/object:Gem::Specification 
 name: godhead
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
-- Philip (flip) Kromer
+- Philip (flip) Kromer, Dhruv Bansal, Carl Knutson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-10 00:00:00 -05:00
+date: 2010-06-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: god
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id004
+    version: 
 description: Configure God monitored processes according to their concerns the servers (path and so forth), site policy (number, ports, etc), and notification (email groups, mailserver, etc).
-email: flip@infochimps.org
+email: coders@infochimps.org
 executables: []
 
 extensions: []
@@ -85,7 +72,6 @@ files:
 - examples/etc/god/god_config.yaml
 - examples/etc/god/sample_project.god
 - examples/etc/init.d/god
-- godhead.gemspec
 - lib/godhead.rb
 - lib/godhead/extensions.rb
 - lib/godhead/extensions/hash.rb
@@ -114,7 +100,7 @@ files:
 - spec/godhead_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/mrflip/godhead
+homepage: http://github.com/infochimps/godhead
 licenses: []
 
 post_install_message: 
@@ -126,20 +112,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: God recipes that separate configuration for processes, site policy and notifications; comes with many examples

data/godhead.gemspec

@@ -1,91 +0,0 @@
-# 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{godhead}
-  s.version = "0.0.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Philip (flip) Kromer"]
-  s.date = %q{2010-04-10}
-  s.description = %q{Configure God monitored processes according to their concerns the servers (path and so forth), site policy (number, ports, etc), and notification (email groups, mailserver, etc).}
-  s.email = %q{flip@infochimps.org}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.textile"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "examples/etc/god.conf",
-     "examples/etc/god/god_config.yaml",
-     "examples/etc/god/sample_project.god",
-     "examples/etc/init.d/god",
-     "godhead.gemspec",
-     "lib/godhead.rb",
-     "lib/godhead/extensions.rb",
-     "lib/godhead/extensions/hash.rb",
-     "lib/godhead/extensions/string.rb",
-     "lib/godhead/god_email.rb",
-     "lib/godhead/god_recipe.rb",
-     "lib/godhead/mixins.rb",
-     "lib/godhead/mixins/runs_as_service.rb",
-     "lib/godhead/notifications.rb",
-     "lib/godhead/process_groups.rb",
-     "lib/godhead/recipes.rb",
-     "lib/godhead/recipes/beanstalkd_recipe.rb",
-     "lib/godhead/recipes/delayed_job_recipe.rb",
-     "lib/godhead/recipes/generic_worker_recipe.rb",
-     "lib/godhead/recipes/memcached_recipe.rb",
-     "lib/godhead/recipes/mongrel_recipe.rb",
-     "lib/godhead/recipes/mysql_recipe.rb",
-     "lib/godhead/recipes/nginx_recipe.rb",
-     "lib/godhead/recipes/resque_recipe.rb",
-     "lib/godhead/recipes/starling_recipe.rb",
-     "lib/godhead/recipes/thin_recipe.rb",
-     "lib/godhead/recipes/thinking_sphinx.rb",
-     "lib/godhead/recipes/tyrant_recipe.rb",
-     "lib/godhead/recipes/unicorn_recipe.rb",
-     "lib/godhead/recipes/workling_recipe.rb",
-     "spec/godhead_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/mrflip/godhead}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{God recipes that separate configuration for processes, site policy and notifications; comes with many examples}
-  s.test_files = [
-    "spec/godhead_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_runtime_dependency(%q<god>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-    else
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<god>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<god>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-  end
-end
-