god 0.7.3 → 0.7.5

data/History.txt

@@ -1,10 +1,18 @@
+== 0.7.5 / 2008-02-21
+  * Bug Fixes
+    * Remove Ruby's Logger and replace with custom SimpleLogger to stop threaded leak
+
+== 0.7.4 / 2008-02-18
+  * Bug Fixes
+    * Introduce local scope to prevent faulty optimization that causes memory to leak
+
 == 0.7.3 / 2008-02-14
   * Minor Enhancements
     * Add --bleakhouse to make running diagnostics easier
   * Bug Fixes
-    * Use ::Process.kill(0, ...) instead of `kill -0`
-    * Fix pid_file behavior in process-centric conditions so they work with tasks
-    * Redirect output of daemonized god to log file or /dev/null earlier
+    * Use ::Process.kill(0, ...) instead of `kill -0` [queso]
+    * Fix pid_file behavior in process-centric conditions so they work with tasks [matias]
+    * Redirect output of daemonized god to log file or /dev/null earlier [_eric]
 
 == 0.7.2 / 2008-02-04
   * Bug Fixes

data/Manifest.txt

@@ -45,6 +45,7 @@ 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/process.rb
@@ -67,6 +68,7 @@ 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/matias/matias.god
 test/configs/real.rb
 test/configs/running_load/running_load.god
 test/configs/stress/simple_server.rb

data/README.txt

@@ -24,12 +24,20 @@ Sign up for the god mailing list at http://groups.google.com/group/god-rb
 == INSTALL:
 
   $ sudo gem install god
+  
+== CONTRIBUTE:
+
+Latest code is available at http://github.com/mojombo/god
+
+The 'master' branch can be cloned with:
+
+  $ git clone git://github.com/mojombo/god.git
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2007 FIX
+Copyright (c) 2007 Tom Preston-Werner
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('god', '0.7.3') do |p|
+Hoe.new('god', '0.7.5') do |p|
   p.rubyforge_name = 'god'
   p.author = 'Tom Preston-Werner'
   p.email = 'tom@rubyisawesome.com'

data/lib/god.rb

@@ -5,7 +5,6 @@ require 'rubygems'
 
 # core
 require 'stringio'
-require 'logger'
 require 'fileutils'
 
 begin
@@ -19,6 +18,7 @@ end
 
 # internal requires
 require 'god/errors'
+require 'god/simple_logger'
 require 'god/logger'
 require 'god/system/process'
 require 'god/dependency_graph'
@@ -70,7 +70,6 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. ext god])
 
 # App wide logging system
 LOG = God::Logger.new
-LOG.datetime_format = "%Y-%m-%d %H:%M:%S "
 
 def applog(watch, level, text)
   LOG.log(watch, level, text)
@@ -130,7 +129,7 @@ class Module
 end
 
 module God
-  VERSION = '0.7.3'
+  VERSION = '0.7.5'
   
   LOG_BUFFER_SIZE_DEFAULT = 100
   PID_FILE_DIRECTORY_DEFAULTS = ['/var/run/god', '~/.god/pids']

data/lib/god/configurable.rb

@@ -31,6 +31,7 @@ module God
     end
     
     def base_name
+      x = 1 # fix for MRI's local scope optimization bug DO NOT REMOVE!
       self.class.name.split('::').last
     end
     

data/lib/god/logger.rb

@@ -1,6 +1,6 @@
 module God
   
-  class Logger < ::Logger
+  class Logger < SimpleLogger
     SYSLOG_EQUIVALENTS = {:fatal => :crit,
                           :error => :err,
                           :warn => :debug,
@@ -22,7 +22,7 @@ module God
       @mutex = Mutex.new
       @capture = nil
       @templogio = StringIO.new
-      @templog = ::Logger.new(@templogio)
+      @templog = SimpleLogger.new(@templogio)
       @templog.level = Logger::INFO
       load_syslog
     end

data/lib/god/simple_logger.rb

@@ -0,0 +1,53 @@
+module God
+  
+  class SimpleLogger
+    DEBUG = 2
+    INFO = 4
+    WARN = 8
+    ERROR = 16
+    FATAL = 32
+    
+    SEV_LABEL = {DEBUG => 'DEBUG',
+                 INFO => 'INFO',
+                 WARN => 'WARN',
+                 ERROR => 'ERROR',
+                 FATAL => 'FATAL'}
+    
+    attr_accessor :datetime_format, :level
+    
+    def initialize(io)
+      @io = io
+      @level = INFO
+      @datetime_format = "%Y-%m-%d %H:%M:%S"
+    end
+    
+    def output(level, msg)
+      return if level < self.level
+      
+      time = Time.now.strftime(self.datetime_format)
+      label = SEV_LABEL[level]
+      @io.print("#{label[0..0]} [#{time}] #{label.rjust(5)}: #{msg}\n")
+    end
+    
+    def fatal(msg)
+      self.output(FATAL, msg)
+    end
+    
+    def error(msg)
+      self.output(ERROR, msg)
+    end
+    
+    def warn(msg)
+      self.output(WARN, msg)
+    end
+    
+    def info(msg)
+      self.output(INFO, msg)
+    end
+    
+    def debug(msg)
+      self.output(DEBUG, msg)
+    end
+  end
+  
+end

data/test/configs/matias/matias.god

@@ -0,0 +1,50 @@
+$pid_file = "/tmp/matias.pid"
+
+God.task do |w|
+  w.name = "watcher"
+  w.interval = 5.seconds
+  w.valid_states = [:init, :up, :down]
+  w.initial_state = :init
+  
+  # determine the state on startup
+  w.transition(:init, { true => :up, false => :down }) do |on|
+    on.condition(:process_running) do |c|
+      c.running = true
+      c.pid_file = $pid_file
+    end
+  end
+  
+  # when process is up
+  w.transition(:up, :down) do |on|
+    # transition to 'start' if process goes down
+    on.condition(:process_running) do |c|
+      c.running = false
+      c.pid_file = $pid_file
+    end
+    
+    # send up info
+    on.condition(:lambda) do |c|
+      c.lambda = lambda do
+        puts 'yay I am up'
+        false
+      end
+    end
+  end
+  
+  # when process is down
+  w.transition(:down, :up) do |on|
+    # transition to 'up' if process comes up
+    on.condition(:process_running) do |c|
+      c.running = true
+      c.pid_file = $pid_file
+    end
+    
+    # send down info
+    on.condition(:lambda) do |c|
+      c.lambda = lambda do
+        puts 'boo I am down'
+        false
+      end
+    end
+  end
+end

data/test/configs/stress/stress.god

@@ -1,8 +1,8 @@
-('01'..'40').each do |i|
+('01'..'08').each do |i|
   God.watch do |w|
     w.name = "stress-#{i}"
     w.start = "ruby " + File.join(File.dirname(__FILE__), *%w[simple_server.rb])
-    w.interval = 1
+    w.interval = 0
     w.grace = 2
     w.group = 'test'
   

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.2
 specification_version: 1
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
-date: 2008-02-13 00:00:00 -08:00
+  version: 0.7.5
+date: 2008-05-13 00:00:00 -07:00
 summary: Like monit, only awesome
 require_paths: 
 - lib
@@ -77,6 +77,7 @@ files:
 - 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/process.rb
@@ -99,6 +100,7 @@ files:
 - test/configs/daemon_polls/simple_server.rb
 - test/configs/degrading_lambda/degrading_lambda.god
 - test/configs/degrading_lambda/tcp_server.rb
+- test/configs/matias/matias.god
 - test/configs/real.rb
 - test/configs/running_load/running_load.god
 - test/configs/stress/simple_server.rb