nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prefer config/script_server.yml over config/script_server_config.yml until we remove the support for the later completly

Browse source
This commit is contained in:
Jonne Hass 2011-09-07 13:26:41 +02:00
parent 3ae8f300ee
commit 92dcffb253
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
script/get_config.rb
View file

@ -22,11 +22,11 @@ if ARGV.length >= 1
setting_name = ARGV[0] setting_name = ARGV[0]
if Rails.env == 'script_server' # load from the special script_server_config.yml file if Rails.env == 'script_server' # load from the special script_server_config.yml file
require 'yaml' require 'yaml'
script_server_config_file = File.join(Rails.root, 'config', 'script_server_config.yml') script_server_config_file = File.join(Rails.root, 'config', 'script_server.yml')
if File.exists? script_server_config_file unless File.exists? script_server_config_file
$stderr.puts "Deprecation warning: config/script_server_config.yml has been renamed to config/script_server.yml" $stderr.puts "Deprecation warning: config/script_server_config.yml has been renamed to config/script_server.yml"
else else
script_server_config_file = File.join(Rails.root, 'config', 'script_server.yml') script_server_config_file = File.join(Rails.root, 'config', 'script_server_config.yml')
end end
begin begin
print YAML.load_file(script_server_config_file)['script_server'][setting_name] print YAML.load_file(script_server_config_file)['script_server'][setting_name]