fluent-plugin-file-sprintf 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 461995197ed18e81301acc69c98ad8528f00d145
-  data.tar.gz: 31ad074c45df03671ec1c6c8b4239cae5dfc6194
+  metadata.gz: 2e4c794378a0121131dbd3723bb922833cecae2c
+  data.tar.gz: 36c2bdcb67c8fbd0af4e74697fc04b5c6602297a
 SHA512:
-  metadata.gz: 099c346032f98edb0229c42cb05873a13f98cd3e98cb64a385685663aa29e50b58bf1b5e66b97183549d9c03dcb6088fe7d5c647a1542a75838cd56cdbfbb66c
-  data.tar.gz: 8fed8950f13f9cf90e0123127544fe700bfb13de83a47f347b30d4eee188db99bdbdcb4383779be77f9b9d61e367790f74d75b39a2bf57c1cfa65ab65dfc12a9
+  metadata.gz: 4935b43e8919108ed0db80c3716f30fc1a4bd8de615baf0c26b1173bdaefdf0bf025fc89cf2c4ad562573bd4b1eb9f52539245fac98f766e810a099c04be97a6
+  data.tar.gz: 9387b6a0fb6ed47c88fd05ab6eea5f55469d0298450570eee9413b69e631c0223a01a5bb3cee39b8173b54beddddf6f16f151a96ba028193cca39a6cce34de42

data/README.md

@@ -1,4 +1,4 @@
-# fluent-plugin-file-sprintf
+# fluent-plugin-file-sprintf, a plugin for [Fluentd](http://fluentd.org)
 
 sprintf output file plugin for Fluentd.
 
@@ -30,6 +30,7 @@ include_tag_key|tag key in record|true
 tag_key_name|tag key name(default:tag)|tag_name
 include_time_key|time key in record|true
 time_key_name|time key name(default:time)|timestamp
+rotate|rotate (default:true)|false
 rotate_format|file rotate format(default:%Y%m%d)|%Y%m%d
 
 ## key_names reserved words

data/fluent-plugin-file-sprintf.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-file-sprintf"
-  spec.version       = "0.0.5"
+  spec.version       = "0.0.6"
   spec.authors       = ["Hiroshi Toyama"]
   spec.email         = ["toyama0919@gmail.com"]
   spec.description   = %q{sprintf output file plugin for Fluentd.}

data/lib/fluent/plugin/out_file_sprintf.rb

@@ -5,15 +5,16 @@ module Fluent
 
     config_param :path, :string
     config_param :format, :string
-    config_param :compress, :bool, :default => true
-    config_param :include_tag_key, :bool, :default => false
-    config_param :tag_key_name, :string, :default => "tag"
-    config_param :include_time_key, :bool, :default => false
-    config_param :time_key_name, :string, :default => "time"
+    config_param :compress, :bool, default: true
+    config_param :include_tag_key, :bool, default: false
+    config_param :tag_key_name, :string, default: 'tag'
+    config_param :include_time_key, :bool, default: false
+    config_param :time_key_name, :string, default: 'time'
     config_param :key_names, :string
-    config_param :time_format, :string, :default => "%Y-%m-%d %H:%M:%S"
-    config_param :rotate_format, :string, :default => "%Y%m%d"
-    config_param :file_prefix_key, :string, :default => "Time.at(time).strftime(@rotate_format)"
+    config_param :time_format, :string, default: '%Y-%m-%d %H:%M:%S'
+    config_param :rotate, :bool, default: true
+    config_param :rotate_format, :string, default: '%Y%m%d'
+    config_param :file_prefix_key, :string, default: 'Time.at(time).strftime(@rotate_format)'
 
     def initialize
       super
@@ -32,9 +33,9 @@ module Fluent
 
     def configure(conf)
       super
-      @key_names = @key_names.split(',').map{|key|
+      @key_names = @key_names.split(',').map do|key|
         key = key.strip
-        result = ""
+        result = ''
         if key == 'time'
           result = "Time.at(time).strftime('#{@time_format}')"
         elsif key == 'tag'
@@ -49,7 +50,7 @@ module Fluent
           result = "record['" + key + "']"
         end
         result
-      }
+      end
       @key_names = @key_names.join(',')
       @eval_string = "%Q{#{@format}} % [#{@key_names}]"
       $log.info "format => #{@eval_string}"
@@ -67,8 +68,12 @@ module Fluent
     end
 
     def write(chunk)
-      write_file(chunk)
-      compress_file
+      if @rotate
+        write_file(chunk)
+        compress_file if @compress
+      else
+        write_file_no_rotate(chunk)
+      end
     end
 
     private
@@ -79,9 +84,9 @@ module Fluent
       end
 
       filename_hash = {}
-      set.each{|prefix|
-        filename_hash[prefix] = File.open(@path + '.' + prefix,'a')
-      }
+      set.each do|prefix|
+        filename_hash[prefix] = File.open(@path + '.' + prefix, 'a')
+      end
 
       chunk.msgpack_each do |tag, time, record|
         result = eval(@eval_string)
@@ -89,25 +94,31 @@ module Fluent
         file.puts result
       end
 
-      filename_hash.each{|k,v|
+      filename_hash.each do|k, v|
         v.close
-      }
+      end
     end
 
-    def compress_file
-      if @compress
-        Dir.glob( "#{@path}.*[^gz]" ).each{ |output_path|
-          if Time.now > File.mtime(output_path) + (@flush_interval * 5)
-            Zlib::GzipWriter.open(output_path + ".gz") do |gz|
-              gz.mtime = File.mtime(output_path)
-              gz.orig_name = output_path
-              gz.write IO.binread(output_path)
-            end
-            FileUtils.remove_file(output_path, force = true)
-          end
-        }
+    def write_file_no_rotate(chunk)
+      file = File.open(@path, 'a')
+      chunk.msgpack_each do |tag, time, record|
+        result = eval(@eval_string)
+        file.puts result
       end
+      file.close
     end
 
+    def compress_file
+      Dir.glob("#{@path}.*[^gz]").each do |output_path|
+        next if File.ftype(output_path) != 'file'
+        next if Time.now < (File.mtime(output_path) + (@flush_interval))
+        Zlib::GzipWriter.open(output_path + '.gz') do |gz|
+          gz.mtime = File.mtime(output_path)
+          gz.orig_name = output_path
+          gz.write IO.binread(output_path)
+        end
+        FileUtils.remove_file(output_path, force = true)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-file-sprintf
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Hiroshi Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ltsv
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: sprintf output file plugin for Fluentd.