god 0.7.5 → 0.7.6

data/History.txt

@@ -1,3 +1,11 @@
+== 0.7.6 / 2008-05-13
+  * Major Enhancements
+    * Implement System::Process methods for Linux based on /proc [Kevin Clark]
+  * Minor Enhancements
+    * Allowing directories to be loaded at start [Bert Goethals]
+  * Bug Fixes
+    * Don't leak events on error in the kqueue handler [Kevin Clark]
+
 == 0.7.5 / 2008-02-21
   * Bug Fixes
     * Remove Ruby's Logger and replace with custom SimpleLogger to stop threaded leak

data/Manifest.txt

@@ -48,7 +48,9 @@ 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
@@ -96,6 +98,7 @@ 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

data/Rakefile

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

data/ext/god/kqueue_handler.c

@@ -80,6 +80,7 @@ kqh_handle_events()
   nevents = kevent(kq, NULL, 0, events, num_to_fetch, NULL);
   
   if (-1 == nevents) {
+    free(events);
     rb_raise(rb_eStandardError, strerror(errno));
   } else {
     for (i = 0; i < nevents; i++) {

data/lib/god.rb

@@ -20,7 +20,11 @@ end
 require 'god/errors'
 require 'god/simple_logger'
 require 'god/logger'
+
 require 'god/system/process'
+require 'god/system/portable_poller'
+require 'god/system/slash_proc_poller'
+
 require 'god/dependency_graph'
 require 'god/timeline'
 require 'god/configurable'
@@ -129,7 +133,7 @@ class Module
 end
 
 module God
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
   
   LOG_BUFFER_SIZE_DEFAULT = 100
   PID_FILE_DIRECTORY_DEFAULTS = ['/var/run/god', '~/.god/pids']

data/lib/god/cli/run.rb

@@ -33,6 +33,60 @@ module God
         end
       end
       
+      def default_run
+        # start attached pid watcher if necessary
+        if @options[:attach]
+          self.attach
+        end
+        
+        if @options[:port]
+          God.port = @options[:port]
+        end
+        
+        if @options[:events]
+          God::EventHandler.load
+        end
+        
+        # set log level, defaults to WARN
+        if @options[:log_level]
+          God.log_level = @options[:log_level]
+        else
+          God.log_level = @options[:daemonize] ? :warn : :info
+        end
+        
+        if @options[:config]
+          unless File.exist?(@options[:config])
+            abort "File not found: #{@options[:config]}"
+          end
+          
+          # start the event handler
+          God::EventHandler.start if God::EventHandler.loaded?
+          
+          load_config @options[:config]
+        end
+      end
+      
+      def run_in_front
+        require 'god'
+        
+        if @options[:bleakhouse]
+          BleakHouseDiagnostic.install
+        end
+        
+        default_run
+        
+        if @options[:log]
+          log_file = File.expand_path(@options[:log])
+          puts "Sending output to log file: #{log_file}"
+          
+          # reset file descriptors
+          STDIN.reopen "/dev/null"
+          STDOUT.reopen(log_file, "a")
+          STDERR.reopen STDOUT
+          STDOUT.sync = true
+        end
+      end
+      
       def run_daemonized
         # trap and ignore SIGHUP
         Signal.trap('HUP') {}
@@ -49,18 +103,8 @@ module God
             STDERR.reopen STDOUT
             STDOUT.sync = true
             
-            # start attached pid watcher if necessary
-            if @options[:attach]
-              self.attach
-            end
-            
-            # set port if requested
-            if @options[:port]
-              God.port = @options[:port]
-            end
-            
             # set pid if requested
-            if @options[:pid]
+            if @options[:pid] # and as deamon
               God.pid = @options[:pid] 
             end
             
@@ -68,9 +112,7 @@ module God
               Logger.syslog = false
             end
             
-            if @options[:events]
-              God::EventHandler.load
-            end
+            default_run
             
             unless God::EventHandler.loaded?
               puts
@@ -83,34 +125,6 @@ module God
               puts
             end
             
-            # load config
-            if @options[:config]
-              # set log level, defaults to WARN
-              if @options[:log_level]
-                God.log_level = @options[:log_level]
-              else
-                God.log_level = :warn
-              end
-              
-              unless File.exist?(@options[:config])
-                abort "File not found: #{@options[:config]}"
-              end
-              
-              # start the event handler
-              God::EventHandler.start if God::EventHandler.loaded?
-              
-              begin
-                load File.expand_path(@options[:config])
-              rescue Exception => e
-                if e.instance_of?(SystemExit)
-                  raise
-                else
-                  puts e.message
-                  puts e.backtrace.join("\n")
-                  abort "There was an error in your configuration file (see above)"
-                end
-              end
-            end
           rescue => e
             puts e.message
             puts e.backtrace.join("\n")
@@ -127,63 +141,35 @@ module God
         exit
       end
       
-      def run_in_front
-        require 'god'
-        
-        if @options[:bleakhouse]
-          BleakHouseDiagnostic.install
-        end
-        
-        # start attached pid watcher if necessary
-        if @options[:attach]
-          self.attach
-        end
-        
-        if @options[:port]
-          God.port = @options[:port]
-        end
-        
-        if @options[:events]
-          God::EventHandler.load
-        end
-        
-        # set log level if requested
-        if @options[:log_level]
-          God.log_level = @options[:log_level]
-        end
-        
-        if @options[:config]
-          unless File.exist?(@options[:config])
-            abort "File not found: #{@options[:config]}"
+      def load_config(config)
+        if File.directory? config
+          files_loaded = false
+          Dir[File.expand_path('**/*.god', config)].each do |god_file|
+            files_loaded ||= load_god_file(File.expand_path(god_file))
           end
-          
-          # start the event handler
-          God::EventHandler.start if God::EventHandler.loaded?
-          
-          begin
-            load File.expand_path(@options[:config])
-          rescue Exception => e
-            if e.instance_of?(SystemExit)
-              raise
-            else
-              puts e.message
-              puts e.backtrace.join("\n")
-              abort "There was an error in your configuration file (see above)"
-            end
+          unless files_loaded
+            abort "No files could be loaded"
           end
-          
-          if @options[:log]
-            log_file = File.expand_path(@options[:log])
-            puts "Sending output to log file: #{log_file}"
-            
-            # reset file descriptors
-            STDIN.reopen "/dev/null"
-            STDOUT.reopen(log_file, "a")
-            STDERR.reopen STDOUT
-            STDOUT.sync = true
+        else
+          unless load_god_file(File.expand_path(config))
+            abort "File could not be loaded"
           end
         end
       end
+      
+      def load_god_file(god_file)
+        load File.expand_path(god_file)
+      rescue Exception => e
+        if e.instance_of?(SystemExit)
+          raise
+        else
+          puts "There was an error in #{god_file}"
+          puts "\t" + e.message
+          puts "\t" + e.backtrace.join("\n\t")
+          return false
+        end
+      end
+      
     end # Run
     
   end

data/lib/god/system/portable_poller.rb

@@ -0,0 +1,42 @@
+module God
+  module System
+    class PortablePoller
+      def initialize(pid)
+        @pid = pid
+      end
+      # Memory usage in kilobytes (resident set size)
+      def memory
+        ps_int('rss')
+      end
+      
+      # Percentage memory usage
+      def percent_memory
+        ps_float('%mem')
+      end
+      
+      # Percentage CPU usage
+      def percent_cpu
+        ps_float('%cpu')
+      end
+      
+      private
+      
+      def ps_int(keyword)
+        `ps -o #{keyword}= -p #{@pid}`.to_i
+      end
+      
+      def ps_float(keyword)
+        `ps -o #{keyword}= -p #{@pid}`.to_f
+      end
+      
+      def ps_string(keyword)
+        `ps -o #{keyword}= -p #{@pid}`.strip
+      end
+      
+      def time_string_to_seconds(text)
+        _, minutes, seconds, useconds = *text.match(/(\d+):(\d{2}).(\d{2})/)
+        (minutes.to_i * 60) + seconds.to_i
+      end
+    end
+  end
+end

data/lib/god/system/process.rb

@@ -4,6 +4,7 @@ module God
     class Process
       def initialize(pid)
         @pid = pid.to_i
+        @poller = fetch_system_poller.new(@pid)
       end
       
       # Return true if this process is running, false otherwise
@@ -13,41 +14,27 @@ module God
       
       # Memory usage in kilobytes (resident set size)
       def memory
-        ps_int('rss')
+        @poller.memory
       end
       
       # Percentage memory usage
       def percent_memory
-        ps_float('%mem')
+        @poller.percent_memory
       end
       
       # Percentage CPU usage
       def percent_cpu
-        ps_float('%cpu')
-      end
-      
-      # Seconds of CPU time (accumulated cpu time, user + system)
-      def cpu_time
-        time_string_to_seconds(ps_string('time'))
+        @poller.percent_cpu
       end
       
       private
       
-      def ps_int(keyword)
-        `ps -o #{keyword}= -p #{@pid}`.to_i
-      end
-      
-      def ps_float(keyword)
-        `ps -o #{keyword}= -p #{@pid}`.to_f
-      end
-      
-      def ps_string(keyword)
-        `ps -o #{keyword}= -p #{@pid}`.strip
-      end
-      
-      def time_string_to_seconds(text)
-        _, minutes, seconds, useconds = *text.match(/(\d+):(\d{2}).(\d{2})/)
-        (minutes.to_i * 60) + seconds.to_i
+      def fetch_system_poller
+        if test(?d, '/proc')
+          SlashProcPoller
+        else
+          PortablePoller
+        end
       end
     end
   

data/lib/god/system/slash_proc_poller.rb

@@ -0,0 +1,62 @@
+module God
+  module System
+    class SlashProcPoller < PortablePoller
+      @@kb_per_page = 4 # TODO: Need to make this portable
+      @@hertz = 100
+      @@total_mem = nil
+      
+      def initialize(pid)
+        super(pid)
+        
+        unless @@total_mem # in K
+          File.open("/proc/meminfo") do |f|
+            @@total_mem = f.gets.split[1]
+          end
+        end
+      end
+      
+      def memory
+        stat[:rss].to_i * @@kb_per_page
+      end
+      
+      def percent_memory
+        (memory / @@total_mem.to_f) * 100
+      end
+      
+      # TODO: Change this to calculate the wma instead
+      def percent_cpu
+        stats = stat
+        total_time = stats[:utime].to_i + stats[:stime].to_i # in jiffies
+        seconds = uptime - stats[:starttime].to_i / @@hertz
+        if seconds == 0
+          0
+        else
+          ((total_time * 1000 / @@hertz) / seconds) / 10
+        end
+      end
+      
+      private
+      
+      # in seconds
+      def uptime
+        File.read('/proc/uptime').split[0].to_f
+      end
+      
+      def stat
+        stats = {}
+        stats[:pid], stats[:comm], stats[:state], stats[:ppid], stats[:pgrp],
+        stats[:session], stats[:tty_nr], stats[:tpgid], stats[:flags],
+        stats[:minflt], stats[:cminflt], stats[:majflt], stats[:cmajflt],
+        stats[:utime], stats[:stime], stats[:cutime], stats[:cstime],
+        stats[:priority], stats[:nice], _, stats[:itrealvalue],
+        stats[:starttime], stats[:vsize], stats[:rss], stats[:rlim],
+        stats[:startcode], stats[:endcode], stats[:startstack], stats[:kstkesp],
+        stats[:kstkeip], stats[:signal], stats[:blocked], stats[:sigignore],
+        stats[:sigcatch], stats[:wchan], stats[:nswap], stats[:cnswap],
+        stats[:exit_signal], stats[:processor], stats[:rt_priority],
+        stats[:policy] = File.read("/proc/#{@pid}/stat").split
+        stats
+      end
+    end
+  end
+end

data/test/test_system_portable_poller.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestSystemPortablePoller < Test::Unit::TestCase
+  def setup
+    pid = Process.pid
+    @process = System::PortablePoller.new(pid)
+  end
+  
+  def test_time_string_to_seconds
+    assert_equal 0, @process.bypass.time_string_to_seconds('0:00:00')
+    assert_equal 0, @process.bypass.time_string_to_seconds('0:00:55')
+    assert_equal 27, @process.bypass.time_string_to_seconds('0:27:32')
+    assert_equal 75, @process.bypass.time_string_to_seconds('1:15:13')
+    assert_equal 735, @process.bypass.time_string_to_seconds('12:15:13')
+  end
+end
+

data/test/test_system_process.rb

@@ -26,17 +26,5 @@ class TestSystemProcess < Test::Unit::TestCase
   def test_percent_cpu
     assert_kind_of Float, @process.percent_cpu
   end
-  
-  def test_cpu_time
-    assert_kind_of Integer, @process.cpu_time
-  end
-  
-  def test_time_string_to_seconds
-    assert_equal 0, @process.bypass.time_string_to_seconds('0:00:00')
-    assert_equal 0, @process.bypass.time_string_to_seconds('0:00:55')
-    assert_equal 27, @process.bypass.time_string_to_seconds('0:27:32')
-    assert_equal 75, @process.bypass.time_string_to_seconds('1:15:13')
-    assert_equal 735, @process.bypass.time_string_to_seconds('12:15:13')
-  end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
-date: 2008-05-13 00:00:00 -07:00
+  version: 0.7.6
+date: 2008-05-21 00:00:00 -07:00
 summary: Like monit, only awesome
 require_paths: 
 - lib
@@ -80,7 +80,9 @@ files:
 - 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
@@ -128,6 +130,7 @@ files:
 - 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
@@ -152,6 +155,7 @@ test_files:
 - 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