[PATCH core 4/5] Core: Overide default Rack::Server server to use :webrick

[mf...@redhat.com]

From: Michal Fojtik <mf...@redhat.com>


Signed-off-by: Michal fojtik <mf...@redhat.com>
---
 server/bin/deltacloudd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/bin/deltacloudd b/server/bin/deltacloudd
index 2f0eaeb..e0ac8a4 100755
--- a/server/bin/deltacloudd
+++ b/server/bin/deltacloudd
@@ -85,7 +85,7 @@ 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|
+  opts.on( '-w', '--webrick', 'Force the use of WEBRick as a server') do |opt|
     options[:webrick] = true
   end
   opts.on('--logdir LOGDIR', "Directory for log files, defaults to #{options[:logdir]}") do |opt|
@@ -209,6 +209,7 @@ unless have_thin
   puts "=> Ctrl-C to shutdown server"
   Dir::chdir($top_srcdir)
   Rack::Server::start(:app => app,
+                      :server => :webrick,
                       :Host => ENV["API_HOST"],
                       :Port => port,
                       :AccessLog => [])
-- 
1.8.0.2

Re: [PATCH core 4/5] Core: Overide default Rack::Server server to use :webrick

[David Lutterkort <lu...@redhat.com>]

On Thu, 2012-12-13 at 12:45 +0100, mfojtik@redhat.com wrote:
> From: Michal Fojtik <mf...@redhat.com>
> 
> 
> Signed-off-by: Michal fojtik <mf...@redhat.com>
> ---
>  server/bin/deltacloudd | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/server/bin/deltacloudd b/server/bin/deltacloudd
> index 2f0eaeb..e0ac8a4 100755
> --- a/server/bin/deltacloudd
> +++ b/server/bin/deltacloudd
> @@ -85,7 +85,7 @@ 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|
> +  opts.on( '-w', '--webrick', 'Force the use of WEBRick as a server') do |opt|

Minor nit: we shouldn't make it easy on people to run webrick (since
they shouldn't). I'd much rather not have a short -w option for this.

David