sunspot_solr 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9c1914c2c766805f204440436b477639f441c59157f8ea8cf3d3ff2b3247c0e
-  data.tar.gz: c7a5a0862b69755a76d39bbcaa6b739bdf519c94398c80097da009b8aa322a8c
+  metadata.gz: a54c5d32df311f332d0c7f0c108429e880d60a7181c50b29d1eed5d678598a43
+  data.tar.gz: 1d24c0f41f77b5e813c12e8c4358f309ed24190134dd6b7c702061915031c052
 SHA512:
-  metadata.gz: 324bd411649634ab9b317773c82069cfb91f40f1fe27ffe908122e975903a9243bb214daf5e9814c873cadcc0ed638297e54dbe05593000c2631d20ae326f7c1
-  data.tar.gz: d54998daedd15e13503a8854bdd64fc39136e81481187256682752139bc9bd92fa053bfc3498bd82e440083f81b7f614a2a407f8324be78158f72c5c27f4c75c
+  metadata.gz: da7e2ff2a4c98b9baa445dadfa2574559a12d745260d549ca6801f5fcb70f32e9d87ec8684e5a9400f10aa722f1a573186d2b251d0184597d66a512e3340acac
+  data.tar.gz: 1c7053118bdfce36b53aed2df860cba9472f20f37d32673ab17fc6ca4a1490136f778d7e9725581c713cd6fea2b915802e8f7c01645915cdbc2d798031c565c2

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
@@ -194,18 +195,26 @@ module Sunspot
 
       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,8 +22,6 @@ 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) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_solr
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Mat Brown
@@ -23,10 +23,10 @@ authors:
 - Sam Granieri
 - Nick Zadrozny
 - Jason Ronallo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -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.1.4
+signing_key:
 specification_version: 4
 summary: Bundled Solr distribution for Sunspot
 test_files: