erichummel-sunspot 1.2.1b → 1.2.1f

data/lib/sunspot/server.rb

@@ -16,7 +16,7 @@ module Sunspot
 
     LOG_LEVELS = Set['SEVERE', 'WARNING', 'INFO', 'CONFIG', 'FINE', 'FINER', 'FINEST']
 
-    attr_accessor :min_memory, :max_memory, :port, :solr_data_dir, :solr_home, :log_file
+    attr_accessor :min_memory, :max_memory, :port, :solr_data_dir, :solr_home, :log_file, :multicore
     attr_writer :pid_dir, :pid_file, :log_level, :solr_data_dir, :solr_home, :solr_jar
 
     #
@@ -66,12 +66,11 @@ module Sunspot
       command << "-Xms#{min_memory}" if min_memory
       command << "-Xmx#{max_memory}" if max_memory
       command << "-Djetty.port=#{port}" if port
-      command << "-Dsolr.data.dir=#{solr_data_dir}" if solr_data_dir
+      command << "-Dsolr.data.dir=#{solr_data_dir}" if solr_data_dir && !multicore
       command << "-Dsolr.solr.home=#{solr_home}" if solr_home
       command << "-Djava.util.logging.config.file=#{logging_config_path}" if logging_config_path
       command << '-jar' << File.basename(solr_jar)
       FileUtils.cd(File.dirname(solr_jar)) do
-        puts Escape.shell_command(command)
         exec(Escape.shell_command(command))
       end
     end

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '1.2.1'
+  VERSION = '1.2.1f'
 end

metadata

@@ -2,7 +2,7 @@
 name: erichummel-sunspot
 version: !ruby/object:Gem::Version 
   prerelease: 5
-  version: 1.2.1b
+  version: 1.2.1f
 platform: ruby
 authors: 
 - Mat Brown