Send email notifications when people comment on diary entries. Closes #655.

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index bc61db5f95493e2c51dfcc2378b85883661d5c02..acb2f916291ab02aced0486022b4688c2b109677 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -9,6 +9,9 @@ class ApplicationController < ActionController::Base
       @user = User.authenticate(:token => session[:token])
       session[:user] = @user.id
     end
       @user = User.authenticate(:token => session[:token])
       session[:user] = @user.id
     end

+  rescue Exception => ex
+    logger.info("Exception authorizing user: #{ex.to_s}")
+    @user = nil

   end
 
   def require_user
   end
 
   def require_user


@@ -36,8 +39,16 @@ class ApplicationController < ActionController::Base
     end 
   end 
 
     end 
   end 
 

-  def check_availability
-    if API_READONLY
+  def check_read_availability
+    if API_STATUS == :offline
+      response.headers['Error'] = "Database offline for maintenance"
+      render :nothing => true, :status => :service_unavailable
+      return false
+    end
+  end
+
+  def check_write_availability
+    if API_STATUS == :offline or API_STATUS == :readonly

       response.headers['Error'] = "Database offline for maintenance"
       render :nothing => true, :status => :service_unavailable
       return false
       response.headers['Error'] = "Database offline for maintenance"
       render :nothing => true, :status => :service_unavailable
       return false