incubator-deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lut...@apache.org
Subject svn commit: r991370 - /incubator/deltacloud/trunk/server/config.ru
Date Tue, 31 Aug 2010 22:27:43 GMT
Author: lutter
Date: Tue Aug 31 22:27:43 2010
New Revision: 991370

URL: http://svn.apache.org/viewvc?rev=991370&view=rev
Log:
Require rubygems before sinatra in config.ru

Sinatra is a gem so we need to require it after requiring
rubygems, not before. This happens to work when the server is
started via deltacloudd command because that command requires
rubygems.

When the server is started without the deltacloudd command (like
in TorqueBox or Passenger) the problem is exposed.

Modified:
    incubator/deltacloud/trunk/server/config.ru

Modified: incubator/deltacloud/trunk/server/config.ru
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/config.ru?rev=991370&r1=991369&r2=991370&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/config.ru (original)
+++ incubator/deltacloud/trunk/server/config.ru Tue Aug 31 22:27:43 2010
@@ -1,5 +1,5 @@
-require 'sinatra'
 require 'rubygems'
+require 'sinatra'
 
 require 'server.rb'
 run Sinatra::Application



Mime
View raw message