Replace deprecated Rails constants

ncbo · Feb 23, 2015 · 893d142 · 893d142
1 parent 49a4243
commit 893d142
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/log.rb b/lib/log.rb
@@ -59,8 +59,8 @@ def self.convert_params(params)
   end
 
   def self.local(level, message)
-    if defined? RAILS_DEFAULT_LOGGER
-      RAILS_DEFAULT_LOGGER.send(level, message)
+    if defined? Rails.logger
+      Rails.logger.send(level, message)
     else
       p "#{level} || #{message}"
     end

diff --git a/script/ssl_server b/script/ssl_server
@@ -21,7 +21,7 @@ end
 options = {
   :Port            => 443,
   :Host            => "0.0.0.0",
-  :environment     => (ENV['RAILS_ENV'] || "development").dup,
+  :environment     => (Rails.env || "development").dup,
   :config          => Rails.root + "/config.ru",
   :detach          => false,
   :debugger        => false,
@@ -68,8 +68,8 @@ if options[:detach]
   at_exit { File.delete(pid) if File.exist?(pid) }
 end
 
-ENV["RAILS_ENV"] = options[:environment]
-RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
+Rails.env = options[:environment]
+Rails.env.replace(options[:environment]) if defined?(Rails.env)
 
 if File.exist?(options[:config])
   config = options[:config]

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] = "test"
+Rails.env = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'