You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2013/03/07 12:22:16 UTC

[3/8] git commit: * bin/deltacloudd: explicitly ask for webrick when --webrick is passed in

* bin/deltacloudd: explicitly ask for webrick when --webrick is passed in

TrackedAt: http://tracker.deltacloud.org/patch/9953d987381f13f996c4f071cf106d089234c32a


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/a21abb90
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/a21abb90
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/a21abb90

Branch: refs/heads/master
Commit: a21abb90d801377cfc4961bc18b10722eabb839e
Parents: b4c4c13
Author: David Lutterkort <lu...@redhat.com>
Authored: Wed Mar 6 17:32:45 2013 -0800
Committer: Michal fojtik <mf...@redhat.com>
Committed: Thu Mar 7 12:17:16 2013 +0100

----------------------------------------------------------------------
 server/bin/deltacloudd |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a21abb90/server/bin/deltacloudd
----------------------------------------------------------------------
diff --git a/server/bin/deltacloudd b/server/bin/deltacloudd
index 836bc55..9246058 100755
--- a/server/bin/deltacloudd
+++ b/server/bin/deltacloudd
@@ -215,12 +215,10 @@ unless have_thin
     server.add_tcp_listener ENV['API_HOST'], port
     server.run(false)
   else
-    # There's a bug with string ports on JRuby so convert to int
-    # http://jira.codehaus.org/browse/JRUBY-4868
-    puts "=> Ctrl-C to shutdown server"
     Rack::Server::start(:app => app,
                         :Host => ENV["API_HOST"],
                         :Port => port,
+                        :server => 'webrick',
                         :AccessLog => [])
   end
 else