fluent-plugin-file-alternative 0.1.4 → 0.1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 717fa824f86b1d9e7efd9a2c72bc90745886bd85
+  data.tar.gz: 53299516fbc595bc4083fa1859f76764759ab003
+SHA512:
+  metadata.gz: 5bb40a237167cb760d77ef7c9d50b8ee390f12a541d633f79d656e7c64efb88ec4f12e1ef3d5513dcf32fc0b62a45fd69d1642e8e178cb61eb35812351050295
+  data.tar.gz: fd7c06f49331ce0b890bc2e38a2b6db7ad387cc2ce7bfe3746f39b82c78526277938a02259384b6eb77bf4dc04520567b316bb032640ff2cabf95b5c677eec2f

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -1,6 +1,7 @@
-# fluent-plugin-file-alternative
+# fluent-plugin-file-alternative 
 
-File output plugin alternative implementation, **is 100% compatible with fluentd built-in 'out_file'**, and added many options to format output as you want.
+File output plugin alternative implementation, **is 100% compatible with
+[Fluentd](http://fluentd.org) built-in 'out_file'**, and added many options to format output as you want.
 
 FileAlternativeOutput slices data by time (for specified units), and store these data as plain text on local file. You can specify to:
 
@@ -22,6 +23,10 @@ And you can specify output file path as:
 
 And, gzip compression is also supported.
 
+-### Why this is not a patch for out_file?
+-
+-`fluent-plugin-file-alternative` has optimized buffer data structure to make faster to write data on disk. But that buffer structure is not compatible with `out_file`'s one. That's tha reason why this plugin is an another plugin from `out_file`.
+
 ## Configuration
 
 ### FileAlternativeOutput
@@ -29,9 +34,9 @@ And, gzip compression is also supported.
 Standard out_file way (hourly log, compression, time-tag-json):
 
     <match out.**>
-      type file\_alternative
+      type file_alternative
       path /var/log/service/access.*.log
-      time\_slice\_output %Y%m%d_%H
+      time_slice_output %Y%m%d_%H
       compress gzip
     </match>
 
@@ -45,7 +50,7 @@ By this configuration, in gzip compressed file '/var/log/service/access.20120316
 If you don't want fluentd-time and tag in written file, and messages with single attribute (as raw full apache log with newline):
 
     <match out.**>
-      type file\_alternative
+      type file_alternative
       path /var/log/service/access.%Y%m%d_%H.log
       compress gzip
       output_include_time false

data/fluent-plugin-file-alternative.gemspec

@@ -2,19 +2,21 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-file-alternative"
-  gem.version       = "0.1.4"
+  gem.version       = "0.1.5"
 
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{alternative implementation of out_file, with various configurations}
   gem.summary       = %q{alternative implementation of out_file}
   gem.homepage      = "https://github.com/tagomoris/fluent-plugin-file-alternative"
+  gem.license       = "APLv2"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "fluentd"
+  gem.add_runtime_dependency "fluentd", ">= 0.10.39" # This version for @buffer.symlink_path
   gem.add_runtime_dependency "fluent-mixin-plaintextformatter"
+  gem.add_development_dependency "rake"
 end

data/lib/fluent/plugin/out_file_alternative.rb

@@ -3,6 +3,11 @@ require 'fluent/mixin/plaintextformatter'
 class Fluent::FileAlternativeOutput < Fluent::TimeSlicedOutput
   Fluent::Plugin.register_output('file_alternative', self)
 
+  # Define `log` method for v0.10.42 or earlier
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   SUPPORTED_COMPRESS = {
     :gz => :gz,
     :gzip => :gz,
@@ -20,6 +25,8 @@ class Fluent::FileAlternativeOutput < Fluent::TimeSlicedOutput
     c
   end
 
+  config_param :symlink_path, :string, :default => nil
+
   include Fluent::Mixin::PlainTextFormatter
 
   def initialize
@@ -60,6 +67,13 @@ class Fluent::FileAlternativeOutput < Fluent::TimeSlicedOutput
     unless @path.index('/') == 0
       raise Fluent::ConfigError, "Path on filesystem MUST starts with '/', but '#{@path}'"
     end
+
+    if @symlink_path
+      unless @symlink_path.index('/') == 0
+        raise Fluent::ConfigError, "Symlink path on filesystem MUST starts with '/', but '#{@symlink_path}'"
+      end
+      @buffer.symlink_path = @symlink_path
+    end
   end
 
   def start
@@ -132,7 +146,7 @@ class Fluent::FileAlternativeOutput < Fluent::TimeSlicedOutput
         }
       end
     rescue
-      $log.error "failed to write data: path #{path}"
+      log.error "failed to write data: path #{path}"
       raise
     end
     path

data/test/plugin/test_out_file_alternative.rb

@@ -8,6 +8,8 @@ class FileAlternativeOutputTest < Test::Unit::TestCase
     compress gz
   ]
 
+  SYMLINK_PATH = File.expand_path("#{TMP_DIR}/current")
+
   def setup
     Fluent::Test.setup
     FileUtils.rm_rf(TMP_DIR)
@@ -128,4 +130,29 @@ class FileAlternativeOutputTest < Test::Unit::TestCase
     path = d3.run
     assert_equal "#{TMP_DIR}/accesslog.2011-01-02-13-14-15.gz", path[0]
   end
+
+  def test_write_with_symlink
+    conf = CONFIG + %[
+      symlink_path #{SYMLINK_PATH}
+    ]
+    symlink_path = "#{SYMLINK_PATH}"
+
+    d = create_driver(conf)
+    time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+    d.emit({"a"=>1}, time)
+    d.run
+    assert File.exists?(symlink_path)
+    assert File.symlink?(symlink_path)
+    
+    d.instance.start
+    begin
+      10.times { sleep 0.05 }
+      d.instance.enqueue_buffer
+      
+      assert !File.exists?(symlink_path)
+      assert File.symlink?(symlink_path)
+    ensure
+      d.instance.shutdown
+    end
+  end
 end

metadata

@@ -1,46 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-file-alternative
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.39
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.39
 - !ruby/object:Gem::Dependency
   name: fluent-mixin-plaintextformatter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
 description: alternative implementation of out_file, with various configurations
@@ -50,7 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -61,28 +71,28 @@ files:
 - test/plugin/test_out_file_alternative.rb
 - test/plugin/test_out_file_original.rb
 homepage: https://github.com/tagomoris/fluent-plugin-file-alternative
-licenses: []
+licenses:
+- APLv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: alternative implementation of out_file
 test_files:
 - test/helper.rb