Fix up the rest of the local Solr instance management.

rubygems · Jun 3, 2011 · b95742d · b95742d
1 parent 4e474f1
commit b95742d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ log/*.log
 tmp/
 .sass-cache/
 *.rbc
+solr/data
diff --git a/lib/tasks/solr.rake b/lib/tasks/solr.rake
@@ -1,10 +1,14 @@
 namespace :solr do
 
   task :run => :environment do
+    solr_port = {'test' => 8981, 'development' => 8982 }[Rails.env] || 8983
     system %(
       cd vendor/solr &&
       java \
         -Dsolr.solr.home=#{Rails.root.join('solr')} \
+        -Dsolr.data.dir=#{Rails.root.join('solr/data', Rails.env)} \
+        -Djava.util.logging.config.file=#{Rails.root.join('solr/conf/logging.properties')} \
+        -Djetty.port=#{solr_port} \
         -jar start.jar
     )
   end

diff --git a/solr/conf/logging.properties b/solr/conf/logging.properties
@@ -0,0 +1,6 @@
+handlers = java.util.logging.ConsoleHandler
+.handlers = java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level = INFO
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler