From 13f34db55c3ba58f727590b11e1a9619524125d2 Mon Sep 17 00:00:00 2001
From: Mat Brown <mat@patch.com>
Date: Thu, 11 Mar 2010 11:00:08 -0500
Subject: [PATCH] Allow specification of min_memory and max_memory in
 config/sunspot.yml

[#87 state:resolved]
---
 sunspot_rails/lib/sunspot/rails/configuration.rb | 16 ++++++++++++++++
 sunspot_rails/lib/sunspot/rails/server.rb        | 14 ++++++++++++++
 sunspot_rails/spec/mock_app/config/sunspot.yml   |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/sunspot_rails/lib/sunspot/rails/configuration.rb b/sunspot_rails/lib/sunspot/rails/configuration.rb
index 79418de6c..71009e095 100644
--- a/sunspot_rails/lib/sunspot/rails/configuration.rb
+++ b/sunspot_rails/lib/sunspot/rails/configuration.rb
@@ -9,6 +9,8 @@ module Rails #:nodoc:
     #     solr:
     #       hostname: localhost
     #       port: 8982
+    #       min_memory: 512M
+    #       max_memory: 1G
     #   test:
     #     solr:
     #       hostname: localhost
@@ -194,6 +196,20 @@ def solr_home
             File.join(::Rails.root, 'solr')
           end
       end
+
+      # 
+      # Minimum java heap size for Solr instance
+      #
+      def min_memory
+        @min_memory ||= user_configuration_from_key('solr', 'min_memory')
+      end
+
+      # 
+      # Maximum java heap size for Solr instance
+      #
+      def max_memory
+        @max_memory ||= user_configuration_from_key('solr', 'max_memory')
+      end
       
       private
       
diff --git a/sunspot_rails/lib/sunspot/rails/server.rb b/sunspot_rails/lib/sunspot/rails/server.rb
index c8ef7253e..5bd0f56a3 100644
--- a/sunspot_rails/lib/sunspot/rails/server.rb
+++ b/sunspot_rails/lib/sunspot/rails/server.rb
@@ -91,6 +91,20 @@ def log_file
         File.join(::Rails.root, 'log', "sunspot-solr-#{::Rails.env}.log")
       end
 
+      # 
+      # Minimum Java heap size for Solr
+      #
+      def min_memory
+        configuration.min_memory
+      end
+
+      # 
+      # Maximum Java heap size for Solr
+      #
+      def max_memory
+        configuration.max_memory
+      end
+
       private
 
       #
diff --git a/sunspot_rails/spec/mock_app/config/sunspot.yml b/sunspot_rails/spec/mock_app/config/sunspot.yml
index 34f02fd2e..c6462d58a 100644
--- a/sunspot_rails/spec/mock_app/config/sunspot.yml
+++ b/sunspot_rails/spec/mock_app/config/sunspot.yml
@@ -16,4 +16,4 @@ config_test:
     pid_path: /my_superior_path/pids
     solr_home: /my_superior_path
   auto_commit_after_request: false
-  auto_commit_after_delete_request: true
\ No newline at end of file
+  auto_commit_after_delete_request: true