fluent-plugin-datacounter 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b4d91d5c90fe127587b87a6422a51c7615d4d35
-  data.tar.gz: 44286a9f86f2d5261090a4757abe2e5c5ca5bca1
+  metadata.gz: 64d80ad86bd2585306cd7f6e9ba750f7949d1740
+  data.tar.gz: dc801aa3ae66d93fd1e476743629a06d9dd9df75
 SHA512:
-  metadata.gz: a6f91229701fe9beb94961b5e080669a93d742aa870e50f776fcef86a0c7f9575be603524bbc44c5f6c9a8a09395eb4b1bfa0d42d33af34c00a7891b5b0a98f9
-  data.tar.gz: 190f1d713ba82566fb9ac4d8d47c944daf84e40d86abc8969158a0cfbb72e31e32d90f6397512875b119541c0b4f10b2bcd1c9ffa113073909840fab65b08f94
+  metadata.gz: 99dea601abca6ae123a04e568e5ead302af893f86c4ab9b0682a9f4a6993896aee5cd3f524a03dfcde536905e25a2ed0d1d5e70577161c2e5032b1fc3c46f02b
+  data.tar.gz: 7cc35142eb8ec3484188f4a95656d22ba8983ed994a6d69ce46050925eded3cb22e7f2a16f9bcfe778492d7721791f6546d03cd3514ac228873e5ead521aced7

data/fluent-plugin-datacounter.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-datacounter"
-  gem.version     = "0.4.3"
+  gem.version     = "0.4.4"
   gem.authors     = ["TAGOMORI Satoshi"]
   gem.email       = ["tagomoris@gmail.com"]
   gem.homepage    = "https://github.com/tagomoris/fluent-plugin-datacounter"
@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit"
   gem.add_development_dependency "delorean"
 end

data/lib/fluent/plugin/out_datacounter.rb

@@ -47,7 +47,7 @@ class Fluent::DataCounterOutput < Fluent::Output
               when 'minute' then 60
               when 'hour' then 3600
               when 'day' then 86400
-              else 
+              else
                 raise RuntimeError, "@unit must be one of minute/hour/day"
               end
     end
@@ -134,7 +134,7 @@ class Fluent::DataCounterOutput < Fluent::Output
     if @aggregate == :all
       tag = 'all'
     end
-    
+
     @mutex.synchronize {
       @counts[tag] ||= [0] * (@patterns.length + 1)
       sum = 0
@@ -201,12 +201,18 @@ class Fluent::DataCounterOutput < Fluent::Output
   end
 
   def flush(step) # returns one message
-    flushed,@counts = @counts,count_initialized(@counts.keys.dup.select{|k| @counts[k][-1] > 0})
+    flushed = nil
+    @mutex.synchronize {
+      flushed,@counts = @counts,count_initialized(@counts.keys.dup.select{|k| @counts[k][-1] > 0})
+    }
     generate_output(flushed, step)
   end
 
   def flush_per_tags(step) # returns map of tag - message
-    flushed,@counts = @counts,count_initialized(@counts.keys.dup.select{|k| @counts[k][-1] > 0})
+    flushed = nil
+    @mutex.synchronize {
+      flushed,@counts = @counts,count_initialized(@counts.keys.dup.select{|k| @counts[k][-1] > 0})
+    }
     generate_output_per_tags(flushed, step)
   end
 
@@ -229,7 +235,7 @@ class Fluent::DataCounterOutput < Fluent::Output
     # for internal, or tests only
     @watcher = Thread.new(&method(:watch))
   end
-  
+
   def watch
     # instance variable, and public accessable, for test
     @last_checked ||= Fluent::Engine.now
@@ -302,12 +308,14 @@ class Fluent::DataCounterOutput < Fluent::Output
           stored[:patterns]  == @patterns
 
           if Fluent::Engine.now <= stored[:saved_at] + tick
-            @counts = stored[:counts]
-            @saved_at = stored[:saved_at]
-            @saved_duration = stored[:saved_duration]
-
-            # skip the saved duration to continue counting
-            @last_checked = Fluent::Engine.now - @saved_duration
+            @mutex.synchronize {
+              @counts = stored[:counts]
+              @saved_at = stored[:saved_at]
+              @saved_duration = stored[:saved_duration]
+
+              # skip the saved duration to continue counting
+              @last_checked = Fluent::Engine.now - @saved_duration
+            }
           else
             log.warn "out_datacounter: stored data is outdated. ignore stored data"
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datacounter
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: delorean
   requirement: !ruby/object:Gem::Requirement
@@ -105,10 +119,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to count records with specified regexp patterns
 test_files:
 - test/helper.rb
 - test/plugin/test_out_datacounter.rb
+has_rdoc: