Allow the API to be taken offline completely as well as being put into

readonly mode,

app/controllers/amf_controller.rb

@@ -2,7 +2,7 @@ class AmfController < ApplicationController
   require 'stringio'
 
   session :off
-  before_filter :check_availability
+  before_filter :check_write_availability
 
   # to log:
   # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")

app/controllers/api_controller.rb

@@ -1,6 +1,7 @@
 class ApiController < ApplicationController
 
   session :off
+  before_filter :check_read_availability, :except => [:capabilities]
   after_filter :compress_output
 
   #COUNT is the number of map requests to allow before exiting and starting a new process

app/controllers/application.rb

@@ -39,8 +39,16 @@ class ApplicationController < ActionController::Base
     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

app/controllers/node_controller.rb

@@ -3,7 +3,8 @@ class NodeController < ApplicationController
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :check_availability, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
   after_filter :compress_output
 
   def create

app/controllers/old_node_controller.rb

@@ -2,6 +2,7 @@ class OldNodeController < ApplicationController
   require 'xml/libxml'
 
   session :off
+  before_filter :check_read_availability
   after_filter :compress_output
 
   def history

app/controllers/old_segment_controller.rb

@@ -2,6 +2,7 @@ class OldSegmentController < ApplicationController
   require 'xml/libxml'
 
   session :off
+  before_filter :check_read_availability
   after_filter :compress_output
 
   def history

app/controllers/old_way_controller.rb

@@ -2,6 +2,7 @@ class OldWayController < ApplicationController
   require 'xml/libxml'
 
   session :off
+  before_filter :check_read_availability
   after_filter :compress_output
 
   def history

app/controllers/segment_controller.rb

@@ -3,7 +3,8 @@ class SegmentController < ApplicationController
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :check_availability, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
   after_filter :compress_output
 
   def create

app/controllers/swf_controller.rb

@@ -1,6 +1,6 @@
 class SwfController < ApplicationController
 	session :off
-	before_filter :check_availability
+	before_filter :check_read_availability
 
 # to log:
 # RAILS_DEFAULT_LOGGER.error("Args: #{args[0]}, #{args[1]}, #{args[2]}, #{args[3]}")

app/controllers/way_controller.rb

@@ -3,7 +3,8 @@ class WayController < ApplicationController
 
   session :off
   before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :check_availability, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]
   after_filter :compress_output
 
   def create

config/environment.rb

@@ -77,8 +77,9 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
-# Set to true to put the API in read-only mode
-API_READONLY = false
+# Set to :readonly to put the API in read-only mode or :offline to
+# take it completely offline
+API_STATUS = :online
 
 # Include your application configuration below
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'