@@ -7,7 +7,7 @@ module Sunspot #:nodoc: class Server class << self - delegate :log_file, :log_level, :port, :solr_home, :data_path, :pid_path, :to => :configuration + delegate :log_file, :log_level, :port, :solr_home, :to => :configuration # Name of the sunspot executable (shell script) SUNSPOT_EXECUTABLE = (RUBY_PLATFORM =~ /w(in)?32$/ ? 'sunspot-solr.bat' : 'sunspot-solr') @@ -59,6 +59,17 @@ module Sunspot #:nodoc: def config_path File.join( solr_home, 'conf' ) end + + # + # Directory to store lucene index data files + # + # ==== Returns + # + # String:: data_path + # + def data_path + File.join( solr_home, 'data', ::Rails.env ) + end # # Directory to store custom libraries for solr @@ -71,6 +82,17 @@ module Sunspot #:nodoc: File.join( solr_home, 'lib' ) end + # + # Directory to store pid files + # + # ==== Returns + # + # String:: pid_path + # + def pid_path + File.join( solr_home, 'pids', ::Rails.env ) + end + # # Bootstrap a new solr_home by creating all required # directories. lib/sunspot/rails/server.rb 24715838c08f69c58cbcb1992e8b91c3ec0a298e Mat Brown mat@patch.com http://github.com/outoftime/sunspot_rails/commit/db3972441b64aab2b66984f4d314b3809fe57613 db3972441b64aab2b66984f4d314b3809fe57613 2009-11-06T07:20:38-08:00 2009-11-06T07:20:38-08:00 Revert "Delegate the data_path and pid_path to the Configuration object so that when the server is started it respects the user's configuration settings." This reverts commit 669d530ff865970b7890c94bd0df8f6c8550c18f. This causes failing tests - reverting until Benjamin can take a look. 392667f4940f498809f61cbdfbc54a0b02ea9ed8 Mat Brown mat@patch.com