fluent-plugin-derive 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51798346dc27a15ff0a23c51c4926e146c3af789
-  data.tar.gz: 16dc81bbc0e36994303602b7becc18ccf8091ff0
+  metadata.gz: 40df6241c18260283efffec5f0f93c244c34a40b
+  data.tar.gz: 5915919018654ad6c36a6bb55ec333f63165ac93
 SHA512:
-  metadata.gz: d2a1c43275e27ea1e9a270c6dc35aba23fa89ffd200b6d23099920188ba8deb5e4528e74e767be24ff9cc3de82b911f4c492f4d813c578c2a5a69d16685ac411
-  data.tar.gz: c13f6fede3c12711518daeb96131062032876e5a2528bf0acc6fc976a5ccf445866c509067ea771b45d8a6da67c45b40174498913ff753a114a6d544d81b3a95
+  metadata.gz: 24921c68f917045f314586080a70a35703e313b132ec4f1d610680c531674845fefc260b4b13c69648ca33b27d2eff6a1abac60e54b8819e6a577d94c2f5c4f2
+  data.tar.gz: c99527ac6b9b5479e4f5a6d2cf252473439135390110757aa495934e0da1b029c108bfdad16be77442b890f8282a9776b242942d87f96512d7df7adaa6041412

data/.travis.yml

@@ -2,5 +2,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 gemfile:
   - Gemfile
+  - Gemfile.fluentd.lt.0.10.43

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# 0.0.2 (2014/02/07)
+
+Enhancement:
+
+* Support plugin specific log_level
+
+# 0.0.1 (2013/12/25)
+
+Initial Release
+

data/Gemfile.fluentd.lt.0.10.43

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+# fluentd 0.10.43 or later supports log_level configuration attribute.
+# This tests lt 0.10.43 on travis ci.
+gem 'fluentd', '= 0.10.42'
+
+# Specify your gem's dependencies in fluent-plugin-derive.gemspec
+gemspec

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+end
+task :default => :spec

data/fluent-plugin-derive.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-derive"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Nobuhiro Nikushi"]
   spec.email         = ["deneb.ge@gmail.com"]
   spec.description   = spec.summary

data/lib/fluent/plugin/out_derive.rb

@@ -1,4 +1,9 @@
 class Fluent::DeriveOutput < Fluent::Output
+  # Define `log` method for v0.10.42 or earlier
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   Fluent::Plugin.register_output('derive', self)
 
   KEY_MAX_NUM = 20
@@ -115,8 +120,8 @@ class Fluent::DeriveOutput < Fluent::Output
 
     chain.next
   rescue => e
-    $log.warn e.message
-    $log.warn e.backtrace.join(', ')
+    log.warn e.message
+    log.warn e.backtrace.join(', ')
   end
 
   # @return [Array] time, value
@@ -147,7 +152,7 @@ class Fluent::DeriveOutput < Fluent::Output
 
   def calc_rate(tag, key, cur_value, prev_value, cur_time, prev_time, adjustment = nil)
     if cur_time - prev_time <= 0
-      $log.warn "Could not calculate the rate. multiple input less than one second or minus delta of seconds on tag=#{tag}, key=#{key}"
+      log.warn "Could not calculate the rate. multiple input less than one second or minus delta of seconds on tag=#{tag}, key=#{key}"
       return nil
     end
     rate = (cur_value - prev_value)/(cur_time - prev_time)

data/spec/out_derive_spec.rb

@@ -284,6 +284,42 @@ describe Fluent::DeriveOutput do
 
 
     end
+  end
+
+  describe 'test log' do
+    let(:log) { driver.instance.log }
+    let(:base_config) { %[
+      tag rate
+      key1 foo
+    ] }
+ 
+    def capture_log(log)
+      tmp = log.instance_variable_get(:@out)
+      out = StringIO.new
+      log.instance_variable_set(:@out, out)
+      yield log
+      return out.string
+    ensure
+      # Set back original instance to @out
+      log.instance_variable_set(:@out, tmp)
+    end
+
+    if Fluent::VERSION >= "0.10.43"
+      context "log_level info" do
+        let(:config) { base_config + %[log_level info] }
+
+        it "should not contain debug level" do
+          capture_log(log) {|log| log.debug "foobar" }.should == ""
+        end
+      end
+    end
 
+    context "log" do
+      let(:config) { base_config }
+      it "should work" do
+        capture_log(log) {|log| log.info "foobar" }.should include("foobar")
+      end
+    end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-derive
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -62,7 +62,9 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
+- Gemfile.fluentd.lt.0.10.43
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -91,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: fluentd plugin to derive rate