sunspot 0.10.0 → 0.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION.yml +1 -1
- data/bin/sunspot-solr +5 -5
- metadata +1 -1
data/VERSION.yml
CHANGED
data/bin/sunspot-solr
CHANGED
|
@@ -17,11 +17,11 @@ rescue LoadError => e
|
|
|
17
17
|
end
|
|
18
18
|
|
|
19
19
|
working_directory = FileUtils.pwd
|
|
20
|
-
|
|
20
|
+
solr_install = File.expand_path(File.join(File.dirname(__FILE__), '..', 'solr'))
|
|
21
21
|
|
|
22
22
|
port = '8983'
|
|
23
23
|
data_dir = File.expand_path(File.join(Dir.tmpdir, 'solr_data'))
|
|
24
|
-
|
|
24
|
+
solr_home = File.join(solr_install, 'solr')
|
|
25
25
|
pid_dir = working_directory
|
|
26
26
|
log_file = nil
|
|
27
27
|
log_level = 'OFF'
|
|
@@ -70,13 +70,13 @@ PROPERTIES
|
|
|
70
70
|
end
|
|
71
71
|
|
|
72
72
|
Daemons.run_proc('sunspot-solr', options) do
|
|
73
|
-
FileUtils.cd(
|
|
73
|
+
FileUtils.cd(solr_install) do
|
|
74
74
|
args = ['java']
|
|
75
75
|
args << "-Djetty.port=#{port}" if port
|
|
76
76
|
args << "-Dsolr.data.dir=#{data_dir}" if data_dir
|
|
77
|
-
args << "-Dsolr.solr.home=#{
|
|
77
|
+
args << "-Dsolr.solr.home=#{solr_home}" if solr_home
|
|
78
78
|
args << "-Djava.util.logging.config.file=#{logging_properties(log_file, log_level)}" if log_file and log_level != 'OFF'
|
|
79
|
-
args << '-jar' << 'start.jar'
|
|
79
|
+
args << '-jar' << File.join(solr_install, 'start.jar')
|
|
80
80
|
STDERR.puts(args * ' ')
|
|
81
81
|
Kernel.exec(*args)
|
|
82
82
|
end
|