cirandas.net

commit 7243dff5183ae8425aedf24a7498475bcf78fd9e

Author: Pedro Lucas Porcellis <porcellis@eletrotupi.com>

solr: Increase memory

 config/solr.yml | 3 ++-
 plugins/solr/config/solr.yml | 3 +--
 plugins/solr/lib/ext/search_controller.rb | 19 -------------------


diff --git a/config/solr.yml b/config/solr.yml
index 050f0048261c37784de506a97fe1850db9ba26ea..bcec4f647a359d498cc1d5edc4bc45ea78859e95 100644
--- a/config/solr.yml
+++ b/config/solr.yml
@@ -6,9 +6,10 @@
 # No change is needed to support multitenancy. Only one solr environment will be used.
 # Just remember to use 'rake multitenancy:reindex' for reindexation.
 
+  #jvm_options: -server -Xmx192M -Xms64M
 production:
   url: http://127.0.0.1:8983/solr
-  jvm_options: -server -Xmx192M -Xms64M
+  jvm_options: -server -Xmx2048M -Xms2048M
   timeout: 600
 
 development:




diff --git a/plugins/solr/config/solr.yml b/plugins/solr/config/solr.yml
index b56303aa92b4a504d0e3045cfa1a9bac0da53acc..086c108d7fafbfeee5f621598f9433214208617e 100644
--- a/plugins/solr/config/solr.yml
+++ b/plugins/solr/config/solr.yml
@@ -8,9 +8,8 @@ # Just remember to use 'rake multitenancy:reindex' for reindexation.
 
 production:
   url: http://127.0.0.1:8983/solr
-  jvm_options: -server -Xmx192M -Xms64M
+  jvm_options: -server -Xmx1920M -Xms640M
   timeout: 600
-  data_path: /var/lib/noosfero-data/solr/index
 
 development:
   url: http://0.0.0.0:8982/solr




diff --git a/plugins/solr/lib/ext/search_controller.rb b/plugins/solr/lib/ext/search_controller.rb
deleted file mode 100644
index a17b0b1468bdabbc56af42f22d46931178b3d9bf..0000000000000000000000000000000000000000
--- a/plugins/solr/lib/ext/search_controller.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require_dependency 'search_controller'
-require_dependency 'solr_plugin/facets_browse'
-require_dependency 'solr_plugin/search_helper'
-
-SearchController.class_eval do
-
-  include SolrPlugin::FacetsBrowse
-
-  helper SolrPlugin::SearchHelper
-
-  before_filter :solr_enterprise, only: [:enterprises]
-
-  protected
-
-  def solr_enterprise
-    redirect_to url_for(params.merge facet: {solr_f_enabled: true}) if params[:facet].blank? and params[:query].blank?
-  end
-
-end