From 7683426586caa5f256bb4dffd21a94ed6bdfafb4 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 27 Jun 2013 17:36:58 +0200 Subject: [PATCH] Do not use settings in main scope --- flow/controllers/appflow-server.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index e4916dca5e..3656ead56b 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -73,11 +73,11 @@ set :port, conf[:port] set :config, conf include CloudLogger -enable_logging APPFLOW_LOG, conf[:debug_level].to_i +logger = enable_logging APPFLOW_LOG, conf[:debug_level].to_i use Rack::Session::Pool, :key => 'appflow' -Log.logger = settings.logger +Log.logger = logger Log.level = conf[:debug_level].to_i @@ -87,7 +87,7 @@ Log.info LOG_COMP, "Starting server" begin ENV["ONE_CIPHER_AUTH"] = APPFLOW_AUTH - cloud_auth = CloudAuth.new(settings.config) + cloud_auth = CloudAuth.new(conf) rescue => e message = "Error initializing authentication system : #{e.message}" Log.error LOG_COMP, message