0
@@ -1,4 +1,5 @@
0
 == 0.7.0 Spherical Cow release
0
+ * Tail logfile when stoping and restarting a demonized server, fixes #26.
0
  * Wrap application in a Rack::CommonLogger adapter in debug mode.
0
  * --debug (-D) option no longer set $DEBUG so logging will be less verbose
0
    and Ruby won't be too strict, fixes #36.

0
@@ -1,3 +1,5 @@
0
+require 'open3'
0
+
0
 module Thin
0
   # Run a command though the +thin+ command-line script.
0
   class Command
0
@@ -22,8 +24,11 @@ module Thin
0
     def run
0
       shell_cmd = shellify
0
       trace shell_cmd
0
-      ouput = `#{shell_cmd}`.chomp
0
-      log "  " + ouput.gsub("\n", "  \n") unless ouput.empty?
0
+      trap('INT') {} # Ignore INT signal to pass CTRL+C to subprocess
0
+      Open3.popen3(shell_cmd) do |stdin, stdout, stderr|
0
+        log stdout.gets until stdout.eof?
0
+        log stderr.gets until stderr.eof?
0
+      end
0
     end
0
     
0
     # Turn into a runnable shell command

0
@@ -70,13 +70,19 @@ module Thin
0
       def stop
0
         raise OptionRequired, :pid unless @options[:pid]
0
       
0
-        Server.kill(@options[:pid], @options[:timeout] || 60)
0
+        tail_log(@options[:log]) do
0
+          Server.kill(@options[:pid], @options[:timeout] || 60)
0
+          wait_for_file :deletion, @options[:pid]
0
+        end
0
       end
0
     
0
       def restart
0
         raise OptionRequired, :pid unless @options[:pid]
0
       
0
-        Server.restart(@options[:pid])
0
+        tail_log(@options[:log]) do
0
+          Server.restart(@options[:pid])
0
+          wait_for_file :creation, @options[:pid]
0
+        end
0
       end
0
     
0
       def config
0
@@ -88,6 +94,49 @@ module Thin
0
         File.open(config_file, 'w') { |f| f << @options.to_yaml }
0
         log ">> Wrote configuration to #{config_file}"
0
       end
0
+      
0
+      protected
0
+        # Wait for a pid file to either be created or deleted.
0
+        def wait_for_file(state, file)
0
+          case state
0
+          when :creation then sleep 0.1 until File.exist?(file)
0
+          when :deletion then sleep 0.1 while File.exist?(file)
0
+          end
0
+        end
0
+        
0
+        # Tail the log file of server +number+ during the execution of the block.        
0
+        def tail_log(log_file)
0
+          if log_file
0
+            tail_thread = tail(log_file)
0
+            yield
0
+            tail_thread.kill
0
+          else
0
+            yield
0
+          end
0
+        end
0
+        
0
+        # Acts like GNU tail command. Taken from Rails.
0
+        def tail(file)
0
+          tail_thread = Thread.new do
0
+            Thread.pass until File.exist?(file)
0
+            cursor = File.size(file)
0
+            last_checked = Time.now
0
+            File.open(file, 'r') do |f|
0
+              loop do
0
+                f.seek cursor
0
+                if f.mtime > last_checked
0
+                  last_checked = f.mtime
0
+                  contents = f.read
0
+                  cursor += contents.length
0
+                  print contents
0
+                  STDOUT.flush
0
+                end
0
+                sleep 0.1
0
+              end
0
+            end
0
+          end
0
+          tail_thread
0
+        end
0
     end
0
   end
0
 end
0
\ No newline at end of file

0
@@ -99,7 +99,9 @@ module Thin
0
               sleep 0.1 while Process.running?(pid)
0
             end
0
           rescue Timeout::Error
0
-            print "timeout! "
0
+            print "Timeout! "
0
+            send_signal('KILL', pid_file)
0
+          rescue Interrupt
0
             send_signal('KILL', pid_file)
0
           end
0
         end

0
@@ -62,14 +62,19 @@ describe Controller, 'start' do
0
 end
0
 
0
 describe Controller do
0
+  before do
0
+    @controller = Controller.new(:pid => 'thin.pid', :timeout => 10)
0
+    @controller.stub!(:wait_for_file)
0
+  end
0
+  
0
   it "should stop" do
0
     Server.should_receive(:kill).with('thin.pid', 10)
0
-    Controller.new(:pid => 'thin.pid', :timeout => 10).stop
0
+    @controller.stop
0
   end
0
   
0
   it "should restart" do
0
     Server.should_receive(:restart).with('thin.pid')
0
-    Controller.new(:pid => 'thin.pid').restart
0
+    @controller.restart
0
   end
0
   
0
   it "should write configuration file" do

0
@@ -36,7 +36,7 @@ describe Server, 'on TCP socket' do
0
     post('/', :big => big).should include(big)
0
   end
0
   
0
-  it "should handle GET in less then #{get_request_time = 0.004} RubySecond" do
0
+  it "should handle GET in less then #{get_request_time = 0.0045} RubySecond" do
0
     proc { get('/') }.should be_faster_then(get_request_time)
0
   end
0
   

0
@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
0
   s.add_dependency        'rack',         '>= 0.2.0'
0
   s.add_dependency        'eventmachine', '>= 0.8.1'
0
   unless WIN
0
-    s.add_dependency        'daemons',      '>= 1.0.9'
0
+    s.add_dependency      'daemons',      '>= 1.0.9'
0
   end
0
 
0
   s.files                 = %w(COPYING CHANGELOG README Rakefile) +