remove render_500_nosolr action (#1662)

next-l · May 9, 2022 · 1888a5c · 1888a5c
1 parent 80aee6a
commit 1888a5c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 83 deletions.
diff --git a/app/controllers/concerns/enju_library/controller.rb b/app/controllers/concerns/enju_library/controller.rb
@@ -7,7 +7,6 @@ module Controller
       before_action :store_current_location, unless: :devise_controller?
       rescue_from Pundit::NotAuthorizedError, with: :render_403
       # rescue_from ActiveRecord::RecordNotFound, with: :render_404
-      rescue_from Errno::ECONNREFUSED, with: :render_500_nosolr
       # rescue_from ActionView::MissingTemplate, with: :render_404_invalid_format
       helper_method :filtered_params
     end
@@ -66,20 +65,6 @@ def render_500
       end
     end
 
-    def render_500_nosolr
-      Rails.logger.fatal("please confirm that the Solr is running.")
-      return if performed?
-
-      # flash[:notice] = t('page.connection_failed')
-      respond_to do |format|
-        format.html {render template: "page/500_nosolr", layout: false, status: :internal_server_error}
-        # format.html.phone {render template: "page/500_nosolr", layout: false, status: 500}
-        format.xml {render template: 'page/500', status: :internal_server_error}
-        format.json { render json: {"error": "server_error"} }
-        format.rss {render template: 'page/500.xml', status: :internal_server_error}
-      end
-    end
-
     def after_sign_in_path_for(resource)
       session[:locale] = nil
       super

diff --git a/app/models/library_group.rb b/app/models/library_group.rb
@@ -95,6 +95,7 @@ def email
 #  created_at                    :datetime
 #  updated_at                    :datetime
 #  admin_networks                :text
+#  allow_bookmark_external_url   :boolean          default(FALSE), not null
 #  url                           :string           default("http://localhost:3000/")
 #  settings                      :text
 #  html_snippet                  :text
@@ -110,7 +111,6 @@ def email
 #  header_logo_file_size         :bigint
 #  header_logo_updated_at        :datetime
 #  header_logo_meta              :text
-#  allow_bookmark_external_url   :boolean          default(FALSE), not null
 #  login_banner                  :text
 #  footer_banner                 :text
 #
diff --git a/app/views/page/500_nosolr.html.erb b/app/views/page/500_nosolr.html.erb
diff --git a/spec/fixtures/library_groups.yml b/spec/fixtures/library_groups.yml
@@ -29,6 +29,7 @@ one:
 #  created_at                    :datetime
 #  updated_at                    :datetime
 #  admin_networks                :text
+#  allow_bookmark_external_url   :boolean          default(FALSE), not null
 #  url                           :string           default("http://localhost:3000/")
 #  settings                      :text
 #  html_snippet                  :text
@@ -44,7 +45,6 @@ one:
 #  header_logo_file_size         :bigint
 #  header_logo_updated_at        :datetime
 #  header_logo_meta              :text
-#  allow_bookmark_external_url   :boolean          default(FALSE), not null
 #  login_banner                  :text
 #  footer_banner                 :text
 #