diff options
| author | rautenberg <rautenberg@in-silico.ch> | 2012-05-07 18:09:32 +0200 |
|---|---|---|
| committer | rautenberg <rautenberg@in-silico.ch> | 2012-05-07 18:09:32 +0200 |
| commit | 11aec73756dd72ba37684d870352121e63b8819c (patch) | |
| tree | 71753bb7f7f9e37de5140971a794de179cc53b64 | |
| parent | e7dd33d05f111cd25b9fb24e91ebb5f362413eb2 (diff) | |
| parent | 20f7289875c3b928663e421c717d9e06b89fe6f1 (diff) | |
Merge branch 'development' of github.com:opentox/opentox-server into development
| -rw-r--r-- | lib/environment.rb | 41 | ||||
| -rw-r--r-- | lib/opentox-server.rb | 3 | ||||
| -rw-r--r-- | lib/opentox.rb | 4 |
3 files changed, 4 insertions, 44 deletions
diff --git a/lib/environment.rb b/lib/environment.rb deleted file mode 100644 index 3889dfb..0000000 --- a/lib/environment.rb +++ /dev/null @@ -1,41 +0,0 @@ -# set default environment -ENV['RACK_ENV'] = 'production' unless ENV['RACK_ENV'] - -# load/setup configuration -basedir = File.join(ENV['HOME'], ".opentox") -config_dir = File.join(basedir, "config") -config_file = File.join(config_dir, "#{ENV['RACK_ENV']}.yaml") - -TMP_DIR = File.join(basedir, "tmp") -LOG_DIR = File.join(basedir, "log") - -=begin -if File.exist?(config_file) - CONFIG = YAML.load_file(config_file) - not_found_error "Could not load configuration from \"#{config_file.to_s}\"" unless CONFIG -else - FileUtils.mkdir_p TMP_DIR - FileUtils.mkdir_p LOG_DIR - FileUtils.mkdir_p config_dir - puts "Please edit #{config_file} and restart your application." - exit -end -=end - -logfile = "#{LOG_DIR}/#{ENV["RACK_ENV"]}.log" -$logger = OTLogger.new(logfile) - -=begin -if CONFIG[:logger] and CONFIG[:logger] == "debug" - $logger.level = Logger::DEBUG -else - $logger.level = Logger::WARN -end - -# TODO: move to opentox-client??? -AA_SERVER = CONFIG[:authorization] ? (CONFIG[:authorization][:server] ? CONFIG[:authorization][:server] : nil) : nil -CONFIG[:authorization][:authenticate_request] = [""] unless CONFIG[:authorization][:authenticate_request] -CONFIG[:authorization][:authorize_request] = [""] unless CONFIG[:authorization][:authorize_request] -CONFIG[:authorization][:free_request] = [""] unless CONFIG[:authorization][:free_request] -=end - diff --git a/lib/opentox-server.rb b/lib/opentox-server.rb index 3135048..15cb0cd 100644 --- a/lib/opentox-server.rb +++ b/lib/opentox-server.rb @@ -4,8 +4,7 @@ require 'rack/contrib' require 'sinatra' require 'roo' require 'rdf/n3' -require File.join(File.dirname(__FILE__),"environment.rb") +#require File.join(File.dirname(__FILE__),"environment.rb") require File.join(File.dirname(__FILE__),"4store.rb") -#require File.join(File.dirname(__FILE__),"file-store.rb") require File.join(File.dirname(__FILE__),"opentox.rb") require File.join(File.dirname(__FILE__),"authorization-helper.rb") diff --git a/lib/opentox.rb b/lib/opentox.rb index 9fac2eb..7a73d66 100644 --- a/lib/opentox.rb +++ b/lib/opentox.rb @@ -1,9 +1,11 @@ require 'sinatra/base' require "sinatra/reloader" -require File.join(ENV["HOME"],".opentox","config","default.rb") ENV["RACK_ENV"] ||= "production" +logfile = File.join(ENV['HOME'], ".opentox","log","#{ENV["RACK_ENV"]}.log") +$logger = OTLogger.new(logfile) + module OpenTox # Base class for OpenTox services |