rv 2.991 → 3

data/CHANGELOG

@@ -1,5 +1,5 @@
 
-v2.991. Gem'd; RDoc documentation; automated setup scripts; cluster support. Incompatible changes. Pre-release.
+v3. Gem'd; RDoc documentation; automated setup scripts; cluster support; accurate status reporting. Incompatible changes
 
 v2. Mongrel static directory handler.
 

data/README

@@ -1,7 +1,7 @@
 
 Rv
 
-A little <tt>init.d</tt> system for running Camping apps.
+A little <tt>init.d</tt> system for running Camping apps, for Linux.
 
 == License
 
@@ -12,8 +12,11 @@ Copyright 2007 Cloudburst, LLC. See the included LICENSE file.
 * cluster support
 * custom database configuration
 * interactive setup tasks
+* logging
 
-Linux is required. Ubuntu is known to work; Gentoo should work; others should work with minor or no changes.
+Linux is required. Ubuntu and Gentoo are known to work.
+
+Rv is designed for Camping, but it can actually manage any app for which you write a compatible Mongrel harness.
 
 = Usage
 
@@ -46,10 +49,10 @@ The script also responds to <tt>status</tt>, <tt>restart</tt>, and <tt>stop</tt>
 
 == Troubleshooting
 
-If you're having problems, run:
-  RV_DEBUG=true sudo /etc/init.d/rv start
+If you're having problems, first check <tt>/var/log/rv.log</tt>. If that doesn't help, run:
+  sudo env RV_DEBUG=true /etc/init.d/rv start
   
-Copy out the inner command (between the '<tt>nohup su -c "</tt>' and the first '<tt>< /dev/null...</tt>') and try running it by hand. Make sure you're using the correct user. You can also check <tt>/var/log/rv.log</tt> as well as the application log.
+Copy out the inner command (between the '<tt>nohup sudo -u httpd</tt>' and the '<tt>< /dev/null</tt>') and try running it by hand. Make sure you're using the correct user.
 
 == Apache configuration
 

data/lib/rv.rb

@@ -11,7 +11,8 @@ Available keys are:
 * <tt>'user'</tt> - the system user used to start the apps.
 * <tt>'max_tries'</tt> - the number of retries before giving up on an app (each try takes a half second).
 * <tt>'log'</tt> - the path to Rv's own logfile.
-* <tt>'ruby'</tt> - a string used to start the Ruby interpreter.
+* <tt>'env'</tt> - the path to the <tt>env</tt> utility.
+* <tt>'ruby'</tt> - the name of the Ruby interpreter.
 
 =end
 
@@ -47,7 +48,8 @@ class Rv
 
   DEFAULTS = {
     'user' => 'httpd',
-    'ruby' => '/usr/bin/env ruby',
+    'env' => '/usr/bin/env',
+    'ruby' => 'ruby',
     'conf_dir' => '/etc/rv', 
     'log' => '/var/log/rv.log',
     'harness' => 'rv_harness.rb',
@@ -78,7 +80,6 @@ class Rv
     end
     system "chown #{options['user']} #{options['log']} #{options['null_stream']}"
     system "chgrp #{options['user']} #{options['log']} #{options['null_stream']}"
-
   end
     
   # Perform any action in VALID_ACTIONS. Defaults to running against all applications. Pass a specific app name as <tt>match</tt> if this is not what you want.
@@ -89,6 +90,7 @@ class Rv
     case action 
       when "restart"
         daemon("stop", match)
+        sleep(5) # wait for the sockets to get released
         daemon("start", match)
       when "install"
         install
@@ -105,9 +107,12 @@ class Rv
   # Runs a daemon action. Only called from <tt>perform</tt>.
   def daemon(action, match)
     filenames = Dir["#{options['conf_dir']}/#{match}.yml"]
+
+    # sanity checks
     exit_with("No applications found for '#{match}' in #{options['conf_dir']}/") if filenames.empty?
+    exit_with("Can't write to the log (#{options['log']})") unless check_log
     
-    # Examine matching applications
+    # examine matching applications
     filenames.each do |filename|      
 
       real_config = YAML.load_file(filename)
@@ -121,12 +126,11 @@ class Rv
           @port = config['port'] += cluster_index
 
           pid_file = Rv.pid_file(config['app'], config['port'])  
-          pid = File.open(pid_file).readlines.first.chomp rescue nil
-          running = pid ? `ps -p #{pid}`.split("\n")[1] : nil
+          pid = get_pid(pid_file)
          
           case action         
             when "status"
-              if running
+              if check_pid(pid)
                 note "running"
               elsif pid
                 note "has died"
@@ -134,28 +138,38 @@ class Rv
                 note "not running"
               end
             when "stop"
-              if pid and running
-                system %[nohup su -c "kill -9 #{pid} #{options['null_stream']}" #{options['user']} #{options['log_stream']}]
-                running = nil
-                note "stopped"
+              if pid and check_pid(pid)
+                # send a hard kill
+                run "kill -9 #{pid}"               
+                # remove the pid file, since we didn't let mongrel to do it
+                sleep(0.5)
+                unless check_pid(pid)
+                  File.delete(pid_file) 
+                  running = nil
+                  note "stopped"
+                else
+                  note "failed to stop"
+                end
               elsif pid
-                note "not running"
-                File.delete pid_file            
+                note "has already died"
+                File.delete pid_file      
               else
-                note "pid file #{pid_file.inspect} not found. Application was probably not running."
+                note "not running"
               end
             when "start"
-              unless running 
+              unless check_pid(pid) 
+                # Gentoo requires the env variables to be set within the command, not before the sudo
                 env_variables = config.map {|key, value| "RV_#{key.upcase}=#{value}"}.join(" ")
-                system %[nohup su -c "#{env_variables} #{options['ruby']} #{options['harness']} #{options['null_stream']}" #{options['user']} #{options['log_stream']} &]
-                
+                run "#{options['env']} #{env_variables} #{options['ruby']} #{options['harness']}", true                
                 # wait for the app to initialize
                 tries = 0
                 begin
                   sleep(0.5)
                   tries += 1
-                end while tries < options['max_tries'] and !File.exist?(pid_file)
-                if File.exist?(pid_file)
+                  pid = get_pid(pid_file) # reset the pid
+                end while tries < options['max_tries'] and !(File.exist?(pid_file) and check_pid(pid))
+
+                if File.exist?(pid_file) and check_pid(pid)
                   note "started" 
                 else 
                   note "failed to start"
@@ -255,11 +269,33 @@ class Rv
     puts msg
     exit
   end
+
+  # Makes sure the log is writeable.
+  def check_log
+    run "touch #{options['log']}"
+  end
+  
+  # Reads a pid number from a pid_file.
+  def get_pid(pid_file)
+    File.open(pid_file).readlines.first.chomp rescue nil
+  end
   
+  # Checks if the process number <tt>pid</tt> is running.
+  def check_pid(pid = nil)
+    if pid
+      `ps -p #{pid}`.split("\n")[1]
+    end
+  end
+      
   # Prints a message along with the current port.
   def note(msg)
     puts "  #{msg.capitalize} (#{@port})"
   end
+
+  # Runs a command as the app user, with log redirects, in a way that doubly detaches from the terminal and doesn't require a shell.
+  def run(cmd, background = false)
+    system %[nohup sudo -u #{options['user']} #{cmd} #{options['log_stream']} #{'&' if background}]
+  end 
   
   # system() with debugging output
   def system(string)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rv
 version: !ruby/object:Gem::Version 
-  version: "2.991"
-date: 2007-08-07 00:00:00 -04:00
+  version: "3"
+date: 2007-08-08 00:00:00 -04:00
 summary: A little init.d system for running Camping apps.
 require_paths: 
 - lib