sunspot_rails 2.2.2 → 2.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/sunspot/rails/configuration.rb +4 -12
- data/lib/sunspot/rails/server.rb +9 -16
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 53553509fb1420ff217918c4af4874764cf06d97
|
|
4
|
+
data.tar.gz: 8135d49a163251579ca4233d6e6744b0b34bbbee
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7ad49232bf33f0e1d858bff51a965d022048b8240584b4a08776f508ba29b66d23cc08116c38994c32c0bf2592f473e5338c73ed90ee360a455750814ad4c1ed
|
|
7
|
+
data.tar.gz: 80e5d687362e3aafe2a5cb97e7ad6cb9629c8cdbf2f1b7ade41dbfcd83dca20eb83739f2f047b087a32780e715e8d4d84ae7cd1cf44064f8fbc497fbf4b1daf2
|
|
@@ -12,8 +12,7 @@ module Sunspot #:nodoc:
|
|
|
12
12
|
# solr:
|
|
13
13
|
# hostname: localhost
|
|
14
14
|
# port: 8982
|
|
15
|
-
#
|
|
16
|
-
# max_memory: 1G
|
|
15
|
+
# memory: 1G
|
|
17
16
|
# solr_jar: /some/path/solr15/start.jar
|
|
18
17
|
# bind_address: 0.0.0.0
|
|
19
18
|
# disabled: false
|
|
@@ -278,17 +277,10 @@ module Sunspot #:nodoc:
|
|
|
278
277
|
end
|
|
279
278
|
|
|
280
279
|
#
|
|
281
|
-
#
|
|
280
|
+
# java heap size for Solr instance
|
|
282
281
|
#
|
|
283
|
-
def
|
|
284
|
-
@
|
|
285
|
-
end
|
|
286
|
-
|
|
287
|
-
#
|
|
288
|
-
# Maximum java heap size for Solr instance
|
|
289
|
-
#
|
|
290
|
-
def max_memory
|
|
291
|
-
@max_memory ||= user_configuration_from_key('solr', 'max_memory')
|
|
282
|
+
def memory
|
|
283
|
+
@memory ||= user_configuration_from_key('solr', 'memory')
|
|
292
284
|
end
|
|
293
285
|
|
|
294
286
|
#
|
data/lib/sunspot/rails/server.rb
CHANGED
|
@@ -2,21 +2,21 @@ module Sunspot
|
|
|
2
2
|
module Rails
|
|
3
3
|
class Server < Sunspot::Solr::Server
|
|
4
4
|
|
|
5
|
-
#
|
|
5
|
+
#
|
|
6
6
|
# Directory in which to store PID files
|
|
7
7
|
#
|
|
8
8
|
def pid_dir
|
|
9
9
|
configuration.pid_dir || File.join(::Rails.root, 'tmp', 'pids')
|
|
10
10
|
end
|
|
11
11
|
|
|
12
|
-
#
|
|
12
|
+
#
|
|
13
13
|
# Name of the PID file
|
|
14
14
|
#
|
|
15
15
|
def pid_file
|
|
16
16
|
"sunspot-solr-#{::Rails.env}.pid"
|
|
17
17
|
end
|
|
18
18
|
|
|
19
|
-
#
|
|
19
|
+
#
|
|
20
20
|
# Directory to use for Solr home.
|
|
21
21
|
#
|
|
22
22
|
def solr_home
|
|
@@ -30,14 +30,14 @@ module Sunspot
|
|
|
30
30
|
configuration.solr_executable || super
|
|
31
31
|
end
|
|
32
32
|
|
|
33
|
-
#
|
|
33
|
+
#
|
|
34
34
|
# Address on which to run Solr
|
|
35
35
|
#
|
|
36
36
|
def bind_address
|
|
37
37
|
configuration.bind_address
|
|
38
38
|
end
|
|
39
39
|
|
|
40
|
-
#
|
|
40
|
+
#
|
|
41
41
|
# Port on which to run Solr
|
|
42
42
|
#
|
|
43
43
|
def port
|
|
@@ -48,25 +48,18 @@ module Sunspot
|
|
|
48
48
|
configuration.log_level
|
|
49
49
|
end
|
|
50
50
|
|
|
51
|
-
#
|
|
51
|
+
#
|
|
52
52
|
# Log file for Solr. File is in the rails log/ directory.
|
|
53
53
|
#
|
|
54
54
|
def log_file
|
|
55
55
|
File.join(::Rails.root, 'log', "sunspot-solr-#{::Rails.env}.log")
|
|
56
56
|
end
|
|
57
57
|
|
|
58
|
-
#
|
|
59
|
-
# Minimum Java heap size for Solr
|
|
60
58
|
#
|
|
61
|
-
|
|
62
|
-
configuration.min_memory
|
|
63
|
-
end
|
|
64
|
-
|
|
65
|
-
#
|
|
66
|
-
# Maximum Java heap size for Solr
|
|
59
|
+
# Java heap size for Solr
|
|
67
60
|
#
|
|
68
|
-
def
|
|
69
|
-
configuration.
|
|
61
|
+
def memory
|
|
62
|
+
configuration.memory
|
|
70
63
|
end
|
|
71
64
|
|
|
72
65
|
private
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sunspot_rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.2.
|
|
4
|
+
version: 2.2.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Mat Brown
|
|
@@ -26,7 +26,7 @@ authors:
|
|
|
26
26
|
autorequire:
|
|
27
27
|
bindir: bin
|
|
28
28
|
cert_chain: []
|
|
29
|
-
date: 2015-
|
|
29
|
+
date: 2015-12-15 00:00:00.000000000 Z
|
|
30
30
|
dependencies:
|
|
31
31
|
- !ruby/object:Gem::Dependency
|
|
32
32
|
name: rails
|
|
@@ -48,14 +48,14 @@ dependencies:
|
|
|
48
48
|
requirements:
|
|
49
49
|
- - '='
|
|
50
50
|
- !ruby/object:Gem::Version
|
|
51
|
-
version: 2.2.
|
|
51
|
+
version: 2.2.3
|
|
52
52
|
type: :runtime
|
|
53
53
|
prerelease: false
|
|
54
54
|
version_requirements: !ruby/object:Gem::Requirement
|
|
55
55
|
requirements:
|
|
56
56
|
- - '='
|
|
57
57
|
- !ruby/object:Gem::Version
|
|
58
|
-
version: 2.2.
|
|
58
|
+
version: 2.2.3
|
|
59
59
|
- !ruby/object:Gem::Dependency
|
|
60
60
|
name: nokogiri
|
|
61
61
|
requirement: !ruby/object:Gem::Requirement
|