Merge remote-tracking branch 'upstream/pull/2186'

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5fc31adb8e8b99ccf7c74b5eb117c9dffeffa821..3ab09b63d805bc67899c6e54dabeac86f7d5fa69 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -95,14 +95,14 @@ class ApplicationController < ActionController::Base
   end
 
   def check_api_readable
   end
 
   def check_api_readable

-    if api_status == :offline
+    if api_status == "offline"

       report_error "Database offline for maintenance", :service_unavailable
       false
     end
   end
 
   def check_api_writable
       report_error "Database offline for maintenance", :service_unavailable
       false
     end
   end
 
   def check_api_writable

-    unless api_status == :online
+    unless api_status == "online"

       report_error "Database offline for maintenance", :service_unavailable
       false
     end
       report_error "Database offline for maintenance", :service_unavailable
       false
     end


@@ -110,21 +110,21 @@ class ApplicationController < ActionController::Base
 
   def database_status
     if Settings.status == "database_offline"
 
   def database_status
     if Settings.status == "database_offline"

-      :offline
+      "offline"

     elsif Settings.status == "database_readonly"
     elsif Settings.status == "database_readonly"

-      :readonly
+      "readonly"

     else
     else

-      :online
+      "online"

     end
   end
 
   def api_status
     status = database_status
     end
   end
 
   def api_status
     status = database_status

-    if status == :online
+    if status == "online"

       if Settings.status == "api_offline"
       if Settings.status == "api_offline"

-        status = :offline
+        status = "offline"

       elsif Settings.status == "api_readonly"
       elsif Settings.status == "api_readonly"

-        status = :readonly
+        status = "readonly"

       end
     end
     status
       end
     end
     status