act-fluent-logger-rails 0.5.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 125a872f83e8ef5c46ca1ca293b1365fcb3aed52
-  data.tar.gz: bea7ea99906b406bfda4945cd0683c0e69c61638
+SHA256:
+  metadata.gz: f263d124e7851ae0d53b5c1d5c7fb4804cd948151464e98e2373300467495f2b
+  data.tar.gz: e99b7d0c656a6bb4eeb1cae6d8909ebde1564f0e90a3c115d03c7e282db6adc3
 SHA512:
-  metadata.gz: d2d70096552e8e57783d48c0c055b9528648196aa8ae3863d54aae716c6976b2ab758a2058247df4ed58e3f23d7a6f71e251484cd85c6c0d0fede2694609089c
-  data.tar.gz: 7f6b11895029ade7a9e2a80d5d4934a252f3f915f27878e22a705307c9d11daaba9790b07fc2619c55eb09af2b0ff8a598aa3695bb5e33c5a487ed4c1ac70a2c
+  metadata.gz: 02d7b6e3bc21c6b04664bf1a8dc3378ac45e9867dfd5406219a050f7b14251c81282ca3b549a9fedcf88fee15498f14af089583eb5dc9edf07a02c786b03c296
+  data.tar.gz: 6a86c3ecb7be63f7e318d257f484f2e5afc1c3694ec5b8fab87a0b72a289ab496ac3fad0724387fdb44be6b0c680576deb834b0e651d04a12aa4c04e10d6265c

data/.gitignore

@@ -7,6 +7,7 @@
 /vendor
 Gemfile.lock
 gemfiles/*.lock
+gemfiles/vendor
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,30 +1,25 @@
 language: ruby
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 rvm:
-  - 2.1.10
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+  - 3.0.0-preview2
 gemfile:
-  - gemfiles/rails_4.0.gemfile
-  - gemfiles/rails_4.1.gemfile
-  - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
+  - gemfiles/rails_6.1.gemfile
 matrix:
   exclude:
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5.2.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 2.5.1
-      gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.5.1
-      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.4.10
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.4.10
+      gemfile: gemfiles/rails_6.1.gemfile
+jobs:
+  allow_failures:
+    - rvm: 3.0.0-preview2

data/Appraisals

@@ -1,18 +1,3 @@
-appraise 'rails-4.0' do
-  gem 'railties', '4.0.13'
-  gem 'activesupport', '4.0.13'
-end
-
-appraise 'rails-4.1' do
-  gem 'railties', '4.1.16'
-  gem 'activesupport', '4.1.16'
-end
-
-appraise 'rails-4.2' do
-  gem 'railties', '4.2.8'
-  gem 'activesupport', '4.2.8'
-end
-
 appraise 'rails-5.0' do
   gem 'railties', '5.0.2'
   gem 'activesupport', '5.0.2'
@@ -27,3 +12,8 @@ appraise 'rails-5.2' do
   gem 'railties', '5.2.0'
   gem 'activesupport', '5.2.0'
 end
+
+appraise 'rails-6.0' do
+  gem 'railties', '6.0.0.beta2'
+  gem 'activesupport', '6.0.0.beta2'
+end

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.6.3 / Mar 22 2020
+* Support tls_options #63
+
+## 0.6.2 / Jan 8 2020
+* Rails 6.1
+
+## 0.6.1 / Jan 8 2020
+* Fix warning printed when use Rails 6
+
+## 0.6.0 / Nov 23 2019
+
+* Rails 6
+* Make Thread Safe
+
 ## 0.5.0 / April 29 2017
 
 * Rails 5.2

data/README.md

@@ -4,7 +4,7 @@ Fluent logger.
 
 ## Supported versions
 
- * Rails 4 and 5
+ * Rails 4, 5, 6
 
 ## Installation
 
@@ -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.
 
@@ -113,3 +116,10 @@ ActFluentLoggerRails::Logger.new(flush_immediately: true)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## How to run test with appraisal
+```
+gem install appraisal
+bundle exec appraisal bundle
+bundle exec appraisal rake
+```

data/act-fluent-logger-rails.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rspec", '~> 3.5.0'
   gem.add_runtime_dependency "fluent-logger"
-  gem.add_runtime_dependency "railties", ">= 4", "< 5.3"
-  gem.add_runtime_dependency "activesupport", ">= 4", "< 5.3"
+  gem.add_runtime_dependency "railties", ">= 4", "< 6.2"
+  gem.add_runtime_dependency "activesupport", ">= 4", "< 6.2"
 end

data/gemfiles/{rails_4.0.gemfile → rails_6.0.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "railties", "4.0.13"
-gem "activesupport", "4.0.13"
+gem "railties", "6.0.3.4"
+gem "activesupport", "6.0.3.4"
 
 gemspec path: "../"

data/gemfiles/{rails_4.2.gemfile → rails_6.1.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "railties", "4.2.8"
-gem "activesupport", "4.2.8"
+gem "railties", "6.1.0"
+gem "activesupport", "6.1.0"
 
 gemspec path: "../"

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

@@ -2,6 +2,7 @@ require 'fluent-logger'
 require 'active_support/core_ext'
 require 'uri'
 require 'cgi'
+require 'rails/version'
 
 module ActFluentLoggerRails
 
@@ -40,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
 
@@ -66,7 +68,8 @@ module ActFluentLoggerRails
     end
 
     def tagged(*tags)
-      @tags = tags.flatten
+      @tags_thread_key ||= "fluentd_tagged_logging_tags:#{object_id}".freeze
+      Thread.current[@tags_thread_key] = tags.flatten
       yield self
     ensure
       flush
@@ -84,12 +87,11 @@ 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
-      @messages = []
       @log_tags = log_tags
-      @map = {}
-      after_initialize if respond_to? :after_initialize
+      after_initialize if respond_to?(:after_initialize) && Rails::VERSION::MAJOR < 6
     end
 
     def add(severity, message = nil, progname = nil, &block)
@@ -115,41 +117,55 @@ module ActFluentLoggerRails
         end
 
       if message.encoding == Encoding::UTF_8
-        @messages << message
+        logger_messages << message
       else
-        @messages << message.dup.force_encoding(Encoding::UTF_8)
+        logger_messages << message.dup.force_encoding(Encoding::UTF_8)
       end
 
       flush if @flush_immediately
     end
 
     def [](key)
-      @map[key]
+      map[key]
     end
 
     def []=(key, value)
-      @map[key] = value
+      map[key] = value
     end
 
     def flush
-      return if @messages.empty?
+      return if logger_messages.empty?
       messages = if @messages_type == :string
-                   @messages.join("\n")
+                   logger_messages.join("\n")
                  else
-                   @messages
+                   logger_messages
                  end
-      @map[:messages] = messages
-      @map[@severity_key] = format_severity(@severity)
-      if @tags
-        @log_tags.keys.zip(@tags).each do |k, v|
-          @map[k] = v
-        end
-      end
-      @fluent_logger.post(@tag, @map)
+      map[:messages] = messages
+      map[@severity_key] = format_severity(@severity)
+      add_tags
+
+      @fluent_logger.post(@tag, map)
       @severity = 0
-      @messages.clear
-      @tags = nil
-      @map.clear
+      logger_messages.clear
+      Thread.current[@tags_thread_key] = nil if @tags_thread_key
+      map.clear
+    end
+
+    def add_tags
+      return unless @tags_thread_key && Thread.current.key?(@tags_thread_key)
+      @log_tags.keys.zip(Thread.current[@tags_thread_key]).each do |k, v|
+        map[k] = v
+      end
+    end
+
+    def logger_messages
+      @messages_thread_key ||= "fluentd_logger_messages:#{object_id}".freeze
+      Thread.current[@messages_thread_key] ||= []
+    end
+
+    def map
+      @map_thread_key ||= "fluentd_logger_map:#{object_id}".freeze
+      Thread.current[@map_thread_key] ||= {}
     end
 
     def close

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

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

data/spec/logger_spec.rb

@@ -52,7 +52,6 @@ EOF
   }
 
   describe 'logging' do
-
     describe 'basic' do
       it 'info' do
         # see Rails::Rack::compute_tags
@@ -86,6 +85,39 @@ EOF
       end
     end
 
+    it 'is thread safe' do
+      threads = ['hello', 'world'].map do |tag_name|
+        Thread.new {
+          if tag_name == 'hello'
+            request = double('request', uuid: tag_name)
+            tags = log_tags.values.collect do |tag|
+              case tag
+              when Proc
+                tag.call(request)
+              when Symbol
+                request.send(tag)
+              else
+                tag
+              end
+            end
+          else
+            tags = []
+          end
+          logger.info(tag_name)
+          logger.tagged(tags) { sleep(1) if tag_name == 'hello'; logger.info(tag_name) }
+        }
+      end
+
+      while threads.any?(&:alive?)
+        sleep(0.1)
+      end
+      expect(@my_logger.log).to match_array([
+        ['foo', { messages: ['hello', 'hello'], severity: 'INFO', uuid: 'hello', foo: 'foo_value' } ],
+        ['foo', { messages: ['world', 'world'], severity: 'INFO', uuid: nil, foo: nil } ]
+      ])
+    end
+
+
     describe 'frozen ascii-8bit string' do
       before do
         logger.instance_variable_set(:@messages_type, :string)
@@ -130,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.5.0
+  version: 0.6.3
 platform: ruby
 authors:
 - TAHARA Yoshinori
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -47,7 +47,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.2'
 description: Fluent logger
 email:
 - read.eval.print@gmail.com
@@ -94,12 +94,11 @@ files:
 - README.md
 - Rakefile
 - act-fluent-logger-rails.gemspec
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/act-fluent-logger-rails.rb
 - lib/act-fluent-logger-rails/logger.rb
 - lib/act-fluent-logger-rails/version.rb
@@ -109,7 +108,7 @@ homepage: https://github.com/actindi/act-fluent-logger-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Fluent logger
 test_files:

data/gemfiles/rails_4.1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "railties", "4.1.16"
-gem "activesupport", "4.1.16"
-
-gemspec path: "../"