svn commit: r962211 - in /incubator/deltacloud/trunk/server/libexec: config.ru server.rb

[lu...@apache.org]

Author: lutter
Date: Thu Jul  8 23:36:57 2010
New Revision: 962211

URL: http://svn.apache.org/viewvc?rev=962211&view=rev
Log:
Configuration changes

* do not hardcode production mode by default
* set configuration at the top of server.rb
* in dev mode, make stdout and stderr synchronous

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

Modified: incubator/deltacloud/trunk/server/libexec/config.ru
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/libexec/config.ru?rev=962211&r1=962210&r2=962211&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/libexec/config.ru (original)
+++ incubator/deltacloud/trunk/server/libexec/config.ru Thu Jul  8 23:36:57 2010
@@ -1,13 +1,5 @@
 require 'sinatra'
 require 'rubygems'
 
-set :environment => :production
-set :raise_errors => false
-set :run => false
-
-#log = File.new("log/deltacloud.log", "a+")
-#STDOUT.reopen(log)
-#STDERR.reopen(log)
-
 require 'server.rb'
 run Sinatra::Application

Modified: incubator/deltacloud/trunk/server/libexec/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/libexec/server.rb?rev=962211&r1=962210&r2=962211&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/libexec/server.rb (original)
+++ incubator/deltacloud/trunk/server/libexec/server.rb Thu Jul  8 23:36:57 2010
@@ -12,6 +12,16 @@ require 'sinatra/rabbit'
 require 'sinatra/validation'
 require 'sinatra/lazy_auth'
 
+configure do
+  set :raise_errors => false
+end
+
+configure :development do
+  # So we can just use puts for logging
+  $stdout.sync = true
+  $stderr.sync = true
+end
+
 DRIVER=ENV['API_DRIVER'] ? ENV['API_DRIVER'].to_sym : :mock
 
 # You could use $API_HOST environment variable to change your hostname to