summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-03-23 09:03:25 +0000
committerazul <azul@riseup.net>2017-03-23 09:03:25 +0000
commit96c3123b9a30df3d7750b1f8e4bda2aba3d1fcb7 (patch)
treef16e3d9f830cef89d523ef2da66fd27bb2afd426 /app
parent3efe125d6e3bd5f4eecd18952376ffc37e09b9c5 (diff)
parent1e672227a23afbb9f319a0aefa0b0ca3495fa1c6 (diff)
Merge branch 'bugfix/handle-couch-conflicts' into 'master'
bugfix: handle couch 404s See merge request !26
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb10
-rw-r--r--app/controllers/errors_controller.rb2
-rw-r--r--app/views/errors/server_error.json4
3 files changed, 2 insertions, 14 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8d08a2c..1f37fea 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -10,9 +10,6 @@ class ApplicationController < ActionController::Base
# rendered and that template is not present
before_filter :verify_request_format!, if: :mime_types_specified
- rescue_from StandardError, :with => :default_error_handler
- rescue_from CouchRest::Exception, :with => :default_error_handler
-
ActiveSupport.run_load_hooks(:application_controller, self)
protected
@@ -22,13 +19,6 @@ class ApplicationController < ActionController::Base
mimes.present?
end
- def default_error_handler(exc)
- respond_to do |format|
- format.json { render_json_error(exc) }
- format.all { raise exc } # reraise the exception so the normal thing happens.
- end
- end
-
#
# I think this should be 'errors', not 'error', since that is what
# `respond_with @object` will return. For now, I am leaving this as 'error',
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index 80c270f..2d918b5 100644
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -1,6 +1,4 @@
-# We render http errors ourselves so we can customize them
class ErrorsController < ApplicationController
- respond_to :html
# 404
def not_found
diff --git a/app/views/errors/server_error.json b/app/views/errors/server_error.json
index d9a1a86..a2763f6 100644
--- a/app/views/errors/server_error.json
+++ b/app/views/errors/server_error.json
@@ -1,4 +1,4 @@
{
- "error": "server_error",
+ "error": "server failed",
"message": "Server Error"
-} \ No newline at end of file
+}