act-fluent-logger-rails 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4a5f8557252e81bf439315720d56e55a7142ef99e94192b8b20ad7c6f70a232
-  data.tar.gz: 83d54f7cf71f2438efe0f0f91bb307fdc2230622f039f2b5a2a49e416faa04ff
+  metadata.gz: f263d124e7851ae0d53b5c1d5c7fb4804cd948151464e98e2373300467495f2b
+  data.tar.gz: e99b7d0c656a6bb4eeb1cae6d8909ebde1564f0e90a3c115d03c7e282db6adc3
 SHA512:
-  metadata.gz: 817726d7cc7a8656f3768da96eece0d87f68974e01a35b67e207a27cf28229f25281766163b6cd8ed4fddc59dba305da6c6b2fc50787dcad4dd4736ad3179db3
-  data.tar.gz: 141ee6675d47c310c61828e907640390bf0080dd001ea5c9258bded272287988270e17f155a7c9cd640e7d033afa885d9c8e93ebba517f4ec07494363d61d03d
+  metadata.gz: 02d7b6e3bc21c6b04664bf1a8dc3378ac45e9867dfd5406219a050f7b14251c81282ca3b549a9fedcf88fee15498f14af089583eb5dc9edf07a02c786b03c296
+  data.tar.gz: 6a86c3ecb7be63f7e318d257f484f2e5afc1c3694ec5b8fab87a0b72a289ab496ac3fad0724387fdb44be6b0c680576deb834b0e651d04a12aa4c04e10d6265c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.3 / Mar 22 2020
+* Support tls_options #63
+
 ## 0.6.2 / Jan 8 2020
 * Rails 6.1
 

data/README.md

@@ -89,6 +89,9 @@ Don't use config.log_tags.
 2013-01-18T15:04:50+09:00 foo {"messages":["Started GET \"/\" for 127.0.0.1 at 2013-01-18 15:04:49 +0900","Processing by TopController#index as HTML","Completed 200 OK in 635ms (Views: 479.3ms | ActiveRecord: 39.6ms)"],"severity":"INFO"}
 ```
  * severity_key: The key of severity(DEBUG, INFO, WARN, ERROR).
+ * tls_options: A hash of tls options compatible with [fluent-logger-ruby](https://github.com/fluent/fluent-logger-ruby#tls-setting). The simplest being: 
+	 <pre>tls_options:
+	  use_default_ca: true</pre>
 
 You can add any tags at run time.
 

data/lib/act-fluent-logger-rails/logger.rb

@@ -41,6 +41,7 @@ module ActFluentLoggerRails
           nanosecond_precision: fluent_config['nanosecond_precision'],
           messages_type: fluent_config['messages_type'],
           severity_key: fluent_config['severity_key'],
+          tls_options: fluent_config['tls_options']&.transform_keys { |k| k.to_sym }
         }
       end
 
@@ -86,6 +87,7 @@ module ActFluentLoggerRails
       @severity_key = (options[:severity_key] || :severity).to_sym
       @flush_immediately = options[:flush_immediately]
       logger_opts = {host: host, port: port, nanosecond_precision: nanosecond_precision}
+      logger_opts[:tls_options] = options[:tls_options] unless options[:tls_options].nil?
       @fluent_logger = ::Fluent::Logger::FluentLogger.new(nil, logger_opts)
       @severity = 0
       @log_tags = log_tags

data/lib/act-fluent-logger-rails/version.rb

@@ -1,3 +1,3 @@
 module ActFluentLoggerRails
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/logger_spec.rb

@@ -162,6 +162,43 @@ EOF
       end
     end
 
+    describe 'tls_options' do
+      context 'does not has key' do
+        before do
+          File.open(@config_file.path, 'w') do |f|
+            f.puts <<EOF
+test:
+  fluent_host: '127.0.0.1'
+  fluent_port: 24224
+  tag:         'foo'
+EOF
+          end
+        end
+        it do
+          expect(::Fluent::Logger::FluentLogger).not_to receive(:new).with(nil, hash_including(tls_options: { use_default_ca: true }))
+          logger
+        end
+      end
+      context 'has key' do
+        before do
+          File.open(@config_file.path, 'w') do |f|
+            f.puts <<EOF
+test:
+  fluent_host: '127.0.0.1'
+  fluent_port: 24224
+  tag:         'foo'
+  tls_options:
+    use_default_ca: true
+EOF
+          end
+        end
+        it do
+          expect(::Fluent::Logger::FluentLogger).to receive(:new).with(nil, hash_including(tls_options: { use_default_ca: true }))
+          logger
+        end
+      end
+    end
+
     describe 'severity_key' do
       describe 'not specified' do
         it 'severity' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act-fluent-logger-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - TAHARA Yoshinori
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Fluent logger