fluent-mixin-rewrite-tag-name 0.0.2 → 0.0.3

data/README.md

@@ -21,7 +21,6 @@ For example with `td.apache.access` tag, it will get `td` by `${tag_parts[0]}` a
 **Note** 
 
 * To support upcase placeholder, set `enable_placeholder_upcase true` in configuration.
-* To support hostname placeholder, set `enable_placeholder_upcase true` in configuration.
 * Currently, range expression ```${tag_parts[0..2]}``` is not supported.
 
 #### Placeholder Option
@@ -44,8 +43,7 @@ Adding this mixin plugin, it will enabled to use these placeholder in your plugi
   # it will be rewrited to be 'customprefix.web10-222' when short hostname is 'web10-222'.
   tag               customprefix.${hostname}
   
-  # to use hostname placeholder, set 'enable_placeholder_hostname true'
-  enable_placeholder_hostname  true
+  # to use short hostname placeholder, add option like below.
   hostname_command             hostname -s
 </source>
 ```

data/fluent-mixin-rewrite-tag-name.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-mixin-rewrite-tag-name"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Kentaro Yoshida"]
   spec.email         = ["y.ken.studio@gmail.com"]
   spec.summary       = %q{Fluentd mixin plugin to provides placeholder function for rewriting tag for your any plugins as like fluent-plugin-rewrite-tag-filter. It will let you get easy to implement tag placeholder for your own plugins.}

data/lib/fluent/mixin/rewrite_tag_name.rb

@@ -3,7 +3,7 @@ module Fluent
     module RewriteTagName
       include RecordFilterMixin
       attr_accessor :tag, :hostname_command
-      attr_accessor :enable_placeholder_upcase, :enable_placeholder_hostname
+      attr_accessor :enable_placeholder_upcase
 
       DEFAULT_HOSTNAME_COMMAND = 'hostname'
 
@@ -19,15 +19,9 @@ module Fluent
           @placeholder_expander.enable_placeholder_upcase
         end
 
-        if enable_hostname = conf['enable_placeholder_hostname']
-          @enable_placeholder_hostname = enable_hostname
-        end
-        if @enable_placeholder_hostname
-          hostname_command = @hostname_command || DEFAULT_HOSTNAME_COMMAND
-          hostname = `#{hostname_command}`.chomp
-          @placeholder_expander.enable_placeholder_hostname
-          @placeholder_expander.set_hostname(hostname)
-        end
+        hostname_command = @hostname_command || DEFAULT_HOSTNAME_COMMAND
+        hostname = `#{hostname_command}`.chomp
+        @placeholder_expander.set_hostname(hostname)
       end
 
       def filter_record(tag, time, record)
@@ -52,7 +46,6 @@ module Fluent
         def initialize
           @placeholders = {}
           @enable_options = {
-            :hostname => false,
             :upcase => false,
           }
         end
@@ -64,10 +57,6 @@ module Fluent
           }
         end
 
-        def enable_placeholder_hostname
-          @enable_options[:hostname] = true
-        end
-
         def enable_placeholder_upcase
           @enable_options[:upcase] = true
         end

data/test/plugin.rb

@@ -7,7 +7,6 @@ class Fluent::RewriteTagNameMixinOutput < Fluent::Output
   include Fluent::HandleTagNameMixin
   include Fluent::Mixin::RewriteTagName
   config_set_default :enable_placeholder_upcase, false
-  config_set_default :enable_placeholder_hostname, true
 
   def configure(conf)
     super

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-mixin-rewrite-tag-name
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler