sunspot_solr 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9c1914c2c766805f204440436b477639f441c59157f8ea8cf3d3ff2b3247c0e
-  data.tar.gz: c7a5a0862b69755a76d39bbcaa6b739bdf519c94398c80097da009b8aa322a8c
+  metadata.gz: 0d6ce101ef6541d31f08f0228f8df88c19b24b896f4310bdce70eb07f0b9ac6c
+  data.tar.gz: 6c394cecc80e47f07419ec6eb724ad96c75d2efe4f05ec41f100a1fa0e7b91ce
 SHA512:
-  metadata.gz: 324bd411649634ab9b317773c82069cfb91f40f1fe27ffe908122e975903a9243bb214daf5e9814c873cadcc0ed638297e54dbe05593000c2631d20ae326f7c1
-  data.tar.gz: d54998daedd15e13503a8854bdd64fc39136e81481187256682752139bc9bd92fa053bfc3498bd82e440083f81b7f614a2a407f8324be78158f72c5c27f4c75c
+  metadata.gz: 8580de15e12597bea8417ce5eaa82c0c441cd9559fdf95b6244b7e3d2de3739919740f18a25173345f4518edf4c5d8bdbe6462ed5acbacf8d0356d7627074b70
+  data.tar.gz: f708ea58898e16712a189d159f248414e813d39c84dcbda935ad465e9d254c041c29abc003b8172b2e1a291a0cfb3b2d66eef5f52b64ca4d3ae53e6214ff855a

data/lib/sunspot/solr/server.rb

@@ -95,6 +95,7 @@ module Sunspot
         command << "-p" << "#{port}" if port
         command << "-h" << "#{bind_address}" if bind_address
         command << "-s" << "#{solr_home}" if solr_home
+        command << "-Dlog4j.configuration=file:#{logging_config.path}" if logging_config
 
         exec_in_solr_executable_directory(command)
       end
@@ -170,7 +171,7 @@ module Sunspot
       # Boolean:: success
       #
       def install_solr_home
-        unless File.exists?(solr_home)
+        unless File.exist?(solr_home)
           Sunspot::Solr::Installer.execute(
             solr_home,
             :force => true,
@@ -188,24 +189,32 @@ module Sunspot
       #
       def create_solr_directories
         [pid_dir].each do |path|
-          FileUtils.mkdir_p(path) unless File.exists?(path)
+          FileUtils.mkdir_p(path) unless File.exist?(path)
         end
       end
 
       private
 
-      def logging_config_path
-        return @logging_config_path if defined?(@logging_config_path)
-        @logging_config_path =
+      def logging_config
+        return @logging_config if defined?(@logging_config)
+        @logging_config =
           if log_file
-            logging_config = Tempfile.new('logging.properties')
-            logging_config.puts("handlers = java.util.logging.FileHandler")
-            logging_config.puts("java.util.logging.FileHandler.level = #{log_level.to_s.upcase}")
-            logging_config.puts("java.util.logging.FileHandler.pattern = #{log_file}")
-            logging_config.puts("java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter")
+            logging_config = Tempfile.new('log4j.properties')
+            logging_config.puts("log4j.rootLogger=#{log_level.to_s.upcase}, file, CONSOLE")
+            logging_config.puts("log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender")
+            logging_config.puts("log4j.appender.CONSOLE.layout=org.apache.log4j.EnhancedPatternLayout")
+            logging_config.puts("log4j.appender.CONSOLE.layout.ConversionPattern=%-4r %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n")
+            logging_config.puts("log4j.appender.file=org.apache.log4j.RollingFileAppender")
+            logging_config.puts("log4j.appender.file.MaxFileSize=4MB")
+            logging_config.puts("log4j.appender.file.MaxBackupIndex=9")
+            logging_config.puts("log4j.appender.file.File=#{log_file}")
+            logging_config.puts("log4j.appender.file.layout=org.apache.log4j.EnhancedPatternLayout")
+            logging_config.puts("log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n")
+            logging_config.puts("log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF")
+
             logging_config.flush
             logging_config.close
-            logging_config.path
+            logging_config
           end
       end
     end

data/sunspot_solr.gemspec

@@ -22,13 +22,11 @@ Gem::Specification.new do |s|
     distribution is well suited to development and testing.
   TEXT
 
-  s.rubyforge_project = "sunspot"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'rake', '< 12.3'
+  s.add_development_dependency 'rake', '~> 13.2'
   s.add_development_dependency 'rspec', '~> 3.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_solr
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Mat Brown
@@ -23,25 +23,25 @@ authors:
 - Sam Granieri
 - Nick Zadrozny
 - Jason Ronallo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -565,7 +565,7 @@ homepage: https://github.com/sunspot/sunspot/tree/master/sunspot_solr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -580,8 +580,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Bundled Solr distribution for Sunspot
 test_files: