servolux 0.6.1 → 0.6.2

data/History.txt

@@ -1,3 +1,9 @@
+== 0.6.2 / 2009-07-16
+
+* 1 Minor Enhancement
+  * Added a flag to the server startup method to wait for shutdown
+    before returning
+
 == 0.6.1 / 2009-07-13
 
 * 1 Minor Enhancement

data/lib/servolux.rb

@@ -4,7 +4,7 @@ require 'logging'
 module Servolux
 
   # :stopdoc:
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/servolux/server.rb

@@ -174,7 +174,12 @@ class Servolux::Server
   # shutdown the server, starting and joining the server thread. The PID
   # file is deleted when this method returns.
   #
-  def startup
+  # If +true+ is passed to this method, then it will not return until the
+  # +wait_for_shutdown+ method has been called from another thread. This
+  # flag is used to ensure that the server has shutdown completely when
+  # shutdown by a signal.
+  #
+  def startup( wait = false )
     return self if running?
     @mutex.synchronize {
       @shutdown = ConditionVariable.new
@@ -185,6 +190,7 @@ class Servolux::Server
       trap_signals
       start
       join
+      wait_for_shutdown if wait
     ensure
       delete_pid_file
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: servolux
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -06:00
+date: 2009-07-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency