act-fluent-logger-rails 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 125a872f83e8ef5c46ca1ca293b1365fcb3aed52
-  data.tar.gz: bea7ea99906b406bfda4945cd0683c0e69c61638
+  metadata.gz: 7d902898eefca5581ae67b14013df2f2e9e9c261
+  data.tar.gz: 4971a8ca703b77495e12422db08dd136799827df
 SHA512:
-  metadata.gz: d2d70096552e8e57783d48c0c055b9528648196aa8ae3863d54aae716c6976b2ab758a2058247df4ed58e3f23d7a6f71e251484cd85c6c0d0fede2694609089c
-  data.tar.gz: 7f6b11895029ade7a9e2a80d5d4934a252f3f915f27878e22a705307c9d11daaba9790b07fc2619c55eb09af2b0ff8a598aa3695bb5e33c5a487ed4c1ac70a2c
+  metadata.gz: 2546af248a240f448f9357cb636190f2e160665a9ce8a02e74141ca491f8945138fbbaa735bb6ff24db74127bb6c47b077954820c8d99eaa6ffe4ed7d55d9434
+  data.tar.gz: 22d449f71d50989a3ee924b2f6b48c0f475b0adcdb39f7f1a009570b49e7031b3d01d16aab484533b33f6ec0979ea6401e631ff75b63d45ea756c146d4331820

data/.travis.yml

@@ -1,10 +1,14 @@
 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.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
 gemfile:
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
@@ -12,6 +16,7 @@ gemfile:
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 matrix:
   exclude:
     - rvm: 2.1.10
@@ -20,11 +25,23 @@ matrix:
       gemfile: gemfiles/rails_5.1.gemfile
     - rvm: 2.1.10
       gemfile: gemfiles/rails_5.2.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.5.3
       gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.5.3
       gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 2.5.1
+    - rvm: 2.6.1
       gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 2.5.1
+    - rvm: 2.6.1
       gemfile: gemfiles/rails_4.1.gemfile

data/Appraisals

@@ -27,3 +27,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,8 @@
+## 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
 

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.1"
+  gem.add_runtime_dependency "activesupport", ">= 4", "< 6.1"
 end

data/gemfiles/rails_6.0.gemfile

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

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

@@ -66,7 +66,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
@@ -86,9 +87,7 @@ module ActFluentLoggerRails
       logger_opts = {host: host, port: port, nanosecond_precision: nanosecond_precision}
       @fluent_logger = ::Fluent::Logger::FluentLogger.new(nil, logger_opts)
       @severity = 0
-      @messages = []
       @log_tags = log_tags
-      @map = {}
       after_initialize if respond_to? :after_initialize
     end
 
@@ -115,41 +114,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.0"
 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)

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.0
 platform: ruby
 authors:
 - TAHARA Yoshinori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2019-11-23 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.1'
   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.1'
 - !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.1'
   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.1'
 description: Fluent logger
 email:
 - read.eval.print@gmail.com
@@ -100,6 +100,7 @@ files:
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/act-fluent-logger-rails.rb
 - lib/act-fluent-logger-rails/logger.rb
 - lib/act-fluent-logger-rails/version.rb
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fluent logger