svn commit: r1236526 - /deltacloud/trunk/server/bin/deltacloudd

[lu...@apache.org]

Author: lutter
Date: Fri Jan 27 04:41:02 2012
New Revision: 1236526

URL: http://svn.apache.org/viewvc?rev=1236526&view=rev
Log:
* bin/deltacloudd: add --webrick option to force the use of WEBRick

Modified:
    deltacloud/trunk/server/bin/deltacloudd

Modified: deltacloud/trunk/server/bin/deltacloudd
URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/bin/deltacloudd?rev=1236526&r1=1236525&r2=1236526&view=diff
==============================================================================
--- deltacloud/trunk/server/bin/deltacloudd (original)
+++ deltacloud/trunk/server/bin/deltacloudd Fri Jan 27 04:41:02 2012
@@ -82,6 +82,9 @@ BANNER
   opts.on( '-V', '--verbose', 'Set verbose logging on') do |verbose|
     ENV["API_VERBOSE"] ||= 'true'
   end
+  opts.on(  nil, '--webrick', 'Force the use of WEBRick as a server') do |opt|
+    options[:webrick] = true
+  end
   opts.on( '-h', '--help', '') { options[:help] = true }
 
   opts.separator <<EOS
@@ -173,7 +176,7 @@ end
 
 dirname="#{File.dirname(__FILE__)}/.."
 
-have_thin = library_present?('thin')
+have_thin = options[:webrick].nil? && library_present?('thin')
 have_rerun = library_present?('rerun')
 
 unless have_thin