mojombo-god 0.7.9 → 0.7.10

data/History.txt

@@ -1,4 +1,6 @@
-== 0.7.10 / 
+== 0.7.10 / 2008-11-13
+  * Major Enhancements
+    * Enable sending of arbitrary signals to a task or group via `god signal`
   * Bug Fixes
     * setup logging *after* loading a given config file when daemonized. 
       enables logging to the 'God.log_file' specified in a config file. [github.com/jnewland]

data/Rakefile

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

data/bin/god

@@ -33,6 +33,7 @@ begin
       load <file>                        load a config into a running god
       log <task name>                    show realtime log for given task
       status                             show status of each task
+      signal <task or group name> <sig>  signal all matching tasks
       quit                               stop god
       terminate                          stop god and all tasks
       check                              run self diagnostic

data/lib/god.rb

@@ -148,7 +148,7 @@ class Module
 end
 
 module God
-  VERSION = '0.7.9'
+  VERSION = '0.7.10'
   
   LOG_BUFFER_SIZE_DEFAULT = 100
   PID_FILE_DIRECTORY_DEFAULTS = ['/var/run/god', '~/.god/pids']
@@ -481,6 +481,19 @@ module God
     info
   end
   
+  # Send a signal to each task.
+  #   +name+ is the String name of the task or group
+  #   +signal+ is the signal to send. e.g. HUP, 9
+  #
+  # Returns String[]:task_names
+  def self.signal(name, signal)
+    items = Array(self.watches[name] || self.groups[name]).dup
+    jobs = []
+    items.each { |w| jobs << Thread.new { w.signal(signal) } }
+    jobs.each { |j| j.join }
+    items.map { |x| x.name }
+  end
+  
   # Log lines for the given task since the specified time.
   #   +watch_name+ is the name of the task (may be abbreviated)
   #   +since+ is the Time since which to report log lines

data/lib/god/cli/command.rb

@@ -25,7 +25,7 @@ module God
       end
       
       def dispatch
-        if %w{load status log quit terminate}.include?(@command)
+        if %w{load status signal log quit terminate}.include?(@command)
           setup
           send("#{@command}_command")
         elsif %w{start stop restart monitor unmonitor remove}.include?(@command)
@@ -84,6 +84,29 @@ module God
         end
       end
       
+      def signal_command
+        # get the name of the watch/group
+        name = @args[1]
+        signal = @args[2]
+        
+        puts "Sending signal '#{signal}' to '#{name}'"
+        
+        t = Thread.new { loop { sleep(1); STDOUT.print('.'); STDOUT.flush; sleep(1) } }
+        
+        watches = @server.signal(name, signal)
+        
+        # output response
+        t.kill; STDOUT.puts
+        unless watches.empty?
+          puts 'The following watches were affected:'
+          watches.each do |w|
+            puts '  ' + w
+          end
+        else
+          puts 'No matching task or group'
+        end
+      end
+      
       def log_command
         begin
           Signal.trap('INT') { exit }

data/lib/god/process.rb

@@ -159,6 +159,15 @@ module God
       end
     end
     
+    # Send the given signal to this process.
+    #
+    # Returns nothing
+    def signal(sig)
+      sig = sig.to_i if sig.to_i != 0
+      applog(self, :info, "#{self.name} sending signal '#{sig}' to pid #{self.pid}")
+      ::Process.kill(sig, self.pid) rescue nil
+    end
+    
     def start!
       call_action(:start)
     end

data/lib/god/task.rb

@@ -204,6 +204,10 @@ module God
       self.driver.message(:handle_event, [condition])
     end
     
+    def signal(sig)
+      # noop
+    end
+    
     ###########################################################################
     #
     # Actions

data/lib/god/watch.rb

@@ -14,7 +14,7 @@ module God
     def_delegators :@process, :name, :uid, :gid, :start, :stop, :restart,
                               :name=, :uid=, :gid=, :start=, :stop=, :restart=,
                               :pid_file, :pid_file=, :log, :log=, :log_cmd, :log_cmd=, :alive?, :pid,
-                              :unix_socket, :unix_socket=, :chroot, :chroot=, :env, :env=
+                              :unix_socket, :unix_socket=, :chroot, :chroot=, :env, :env=, :signal
     # 
     def initialize
       super

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-god
 version: !ruby/object:Gem::Version 
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-23 00:00:00 -07:00
+date: 2008-11-13 00:00:00 -08:00
 default_executable: god
 dependencies: []