Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB874DED8 for ; Thu, 7 Mar 2013 11:22:19 +0000 (UTC) Received: (qmail 93677 invoked by uid 500); 7 Mar 2013 11:22:19 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 93507 invoked by uid 500); 7 Mar 2013 11:22:19 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 92581 invoked by uid 99); 7 Mar 2013 11:22:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Mar 2013 11:22:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B61BF831380; Thu, 7 Mar 2013 11:22:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mfojtik@apache.org To: commits@deltacloud.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [3/8] git commit: * bin/deltacloudd: explicitly ask for webrick when --webrick is passed in Message-Id: <20130307112216.B61BF831380@tyr.zones.apache.org> Date: Thu, 7 Mar 2013 11:22:16 +0000 (UTC) * 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 Authored: Wed Mar 6 17:32:45 2013 -0800 Committer: Michal fojtik 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