From 900e9a99e11171c2d2f5435c635a5e70e7c1eefe Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Wed, 11 Jun 2008 19:02:00 +0000
Subject: [PATCH] ActionItem392: updating startup scripts

---
 script/ferret_start | 72 ------------------------------------------------------------------------
 script/ferret_stop  | 26 --------------------------
 script/production   |  4 ++--
 3 files changed, 2 insertions(+), 100 deletions(-)
 delete mode 100755 script/ferret_start
 delete mode 100755 script/ferret_stop

diff --git a/script/ferret_start b/script/ferret_start
deleted file mode 100755
index 50e1909..0000000
--- a/script/ferret_start
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env ruby
-# Ferret DRb server launcher script
-#
-# Place doc/ferret_server.yml into RAILS_ROOT/config and fit to taste. Start
-# it with RAILS_ENV set to the desired environment.
-#
-#
-# To run the demo project's unit tests against the drb server, start it with
-# 
-# RAILS_ENV=test script/ferret_start 
-#
-# and run your tests with the AAF_REMOTE environment variable set to a 
-# non-empty value:
-#
-# AAF_REMOTE=true rake
-#
-# The server writes a log file in log/ferret_server.log, it's 
-# STDOUT gets redirected to log/ferret_server.out
-
-ENV['FERRET_USE_LOCAL_INDEX'] = 'true'
-require File.dirname(__FILE__) + '/../config/boot'
-require RAILS_ROOT + '/config/environment'
-
-
-config = ActsAsFerret::Remote::Config.load
-@pid_file = config['pid_file']
-
-def write_pid_file
-  raise "No PID file defined" if @pid_file.blank?
-  open(@pid_file,"w") {|f| f.write(Process.pid) }
-end
-
-def safefork
-  tryagain = true
-
-  while tryagain
-    tryagain = false
-    begin
-      if pid = fork
-        return pid
-      end
-    rescue Errno::EWOULDBLOCK
-      sleep 5
-      tryagain = true
-    end
-  end
-end
-
-safefork and exit
-at_exit do
-  File.unlink(@pid_file) if @pid_file && File.exists?(@pid_file) && File.read(@pid_file).to_i == Process.pid
-end
-print "Starting ferret DRb server..."
-trap("TERM") { exit(0) }
-sess_id = Process.setsid
-
-
-begin
-  ActsAsFerret::Remote::Server.start
-  write_pid_file
-  puts "Done."
-  STDIN.reopen "/dev/null"                                 # Free file descriptors and
-  STDOUT.reopen "#{RAILS_ROOT}/log/ferret_server.out", "a" # point them somewhere sensible
-  STDERR.reopen STDOUT                                     # STDOUT/STDERR should go to a logfile
-rescue
-  $stderr.puts "Error starting ferret DRb server: #{$!}"
-  $stderr.puts $!.backtrace
-  exit(1)
-end
-DRb.thread.join
-
-# vim:set filetype=ruby:
diff --git a/script/ferret_stop b/script/ferret_stop
deleted file mode 100755
index 63b6952..0000000
--- a/script/ferret_stop
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env script/runner
-
-config = ActsAsFerret::Remote::Config.load
-
-def send_signal(signal, pid_file)
-  pid = open(pid_file).read.to_i
-  print "Sending #{signal} to ferret_server with PID #{pid}..."
-  begin
-    Process.kill(signal, pid)
-  rescue Errno::ESRCH
-    puts "Process does not exist. Not running. Removing stale pid file anyway."
-    File.unlink(pid_file)
-  end
-
-  puts "Done."
-end
-
-pid_file = config['pid_file']
-puts "Stopping ferret_server..."
-if File.file?(pid_file)
-  send_signal("TERM", pid_file) 
-else
-  puts "no pid file found"
-end
-
-# vim:set filetype=ruby:
diff --git a/script/production b/script/production
index da9ca1c..ef404c2 100755
--- a/script/production
+++ b/script/production
@@ -6,7 +6,7 @@ ACTION=$1
 shift
 
 do_start() {
-  ./script/ferret_start
+  ./script/ferret_server -e $RAILS_ENV start
   sleep 1
   mongrel_rails cluster::start
   sleep 3
@@ -15,7 +15,7 @@ do_start() {
 do_stop() {
   mongrel_rails cluster::stop
   sleep 1
-  ./script/ferret_stop
+  ./script/ferret_server -e $RAILS_ENV stop
 }
 
 case "$ACTION" in
--
libgit2 0.21.2