diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-31 23:33:05 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-31 23:33:05 +0000 |
| commit | 33f8ef66084bbfb61bf0b4e0f53e1da5e7cc84dc (patch) | |
| tree | a013b6696b33c21beb89209f5fa2a7861d090539 /app/controllers/application_controller.rb | |
| parent | 30f180b38ab46ca1f754bb796c65132a8ffbe010 (diff) | |
Close xapian db before opening it again
This *ought* to fix the problem with the alert-tracks daemon
opening more and more copies of the xapian db till it exhausts
the available file descriptors.
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1849f23f3..b681f455d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -363,7 +363,10 @@ class ApplicationController < ActionController::Base else @page = this_page end - return InfoRequest.full_search(models, @query, order, ascending, collapse, @per_page, @page) + result = InfoRequest.full_search(models, @query, order, ascending, collapse, @per_page, @page) + result.results # Touch the results to load them, otherwise accessing them from the view + # might fail later if the database has subsequently been reopened. + return result end def get_search_page_from_params return (params[:page] || "1").to_i |