fluent-plugin-redis-store-wejick 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2066d6534ed05cf989174037f8d29e1b645e55
-  data.tar.gz: 1cb7c6c67297f5df88cf40a0077d4d683b8bff5d
+  metadata.gz: 70737670280e0eeb33bb3563447e49d4a775496b
+  data.tar.gz: 41f7932b44117c1fc7bcf1e1575d176307afaadf
 SHA512:
-  metadata.gz: 3764f4ee272235c8be7958fbd4f5abb4fec06e4e0d12ab19abb863de71c23ee6a6988a2205d56cb15b1869b99107d87bd3f51828bae8c3b7a0081a0425d2fc10
-  data.tar.gz: 5d7005008a97dadc79dfdc5dcb8b18ae4809daaaab78152746d5c28bf3f9572d6db5004a48562381383ef28e51841834912f70299622155080a8bf83ea697a34
+  metadata.gz: 144e9b8ac10e86e241bdb749bf9e6c6df1abeb7a2e455974ed885be7c19a631a1ac48de94a0cb95f2c4fe034062166346a5bc2cee4948d34f884c7155e20ba76
+  data.tar.gz: 7c095e45d1a9aa869cebe6768b9eac8ce2c53788cba8311acdc63b6ae9bde039c94bac9ace51a0ba198d2aa8855c219e6dc82d51b136318b3a5fccce7bf7741a

data/README.md

@@ -127,7 +127,7 @@ No more options than common options.
 | `prevent_duplicate` | (0,1) | 0             | Prevent duplicated value in one key (list)           |
 | `string_tolow`	    | (0,1)  | 0            | value to lowercase                  |
 | `string_unescape`	  | (0,1)  | 0            | unescape value                      |
-| `string_unescape_twice`	| (0,1)  | 0        | if you need another unescape        |
+| `string_unescape_twice`	| (0,1)  | 0        | in you need another unescape        |
 | `value_length`      | (0,1)                 | list trimming doesn't honor ordering |
 
 ### `set` storage specific options
@@ -140,6 +140,11 @@ No more options than common options.
 | :----          | :----- | :----------------------- | :------------                                |
 | `score_path`   | string | (_time_ of log event)    | path to lookup for _score_ in the event data |
 | `value_expire` | int    |                          | value expiration in seconds                  |
+| `prevent_duplicate` | (0,1) | 0             | Prevent duplicated value in one key (list)           |
+| `string_tolow`	    | (0,1)  | 0            | value to lowercase                  |
+| `string_unescape`	  | (0,1)  | 0            | unescape value                      |
+| `string_unescape_twice`	| (0,1)  | 0        | in you need another unescape        |
+| `value_length`      | (0,1)                 | z trimming doesn't honor ordering |
 
 If `value_expire` is set, the plugin assumes that the _score_ in the **SortedSet** is
 based on *timestamp* and it deletes expired _members_ every after new event data arrives.

data/fluent-plugin-redis-store-wejick.gemspec

@@ -2,11 +2,11 @@
 Gem::Specification.new do |gem|
     gem.name        = "fluent-plugin-redis-store-wejick"
     gem.email       = "wejick@gmail.com"
-    gem.version     = "0.0.7"
+    gem.version     = "0.0.8"
     gem.authors     = ["wejick", "Gian Giovani"]
     gem.licenses    = ["Apache-2.0"]
-    gem.summary     = %q{Redis(zset/set/list/string/publish) output plugin for Fluentd (in heavy dev, contains config breaking change)}
-    gem.description = %q{Redis(zset/set/list/string/publish) output plugin for Fluentd, in the process to adding more functionality (not stable)...}
+    gem.summary     = %q{Redis(zset/set/list/string/publish) output plugin for Fluentd}
+    gem.description = %q{Redis(zset/set/list/string/publish) output plugin for Fluentd...}
     gem.homepage    = "https://github.com/wejick/fluent-plugin-redis-store"
 
     gem.files         = `git ls-files`.split($\)

data/lib/fluent/plugin/out_redis_store_wejick.rb

@@ -97,6 +97,23 @@ module Fluent
       key = get_key_from(record)
       value = get_value_from(record)
       score = get_score_from(record, time)
+      
+      if 0 < @string_tolow
+        value = lower_string(value)
+      end
+      if 0 < @string_unescape
+        value = unescape_string(value)
+        if 0 <@string_unescape_twice
+          value = unescape_string(value)
+        end
+      end
+      if 0 < @only_alphanumeric
+        if ( /^[a-zA-Z0-9 ]*$/.match(value) ) != nil
+        else
+          return
+        end
+      end
+
       @redis.zadd key, score, value
 
       set_key_expire key
@@ -105,8 +122,8 @@ module Fluent
         @redis.zremrangebyscore key , '-inf' , (now - @value_expire)
       end
       if 0 < @value_length
-        script = generate_zremrangebyrank_script(key, @value_length, @order)
-        @redis.eval script
+        l = -1 - @value_length
+        @redis.zremrangebyrank key, 0, l
       end
     end
 
@@ -173,40 +190,6 @@ module Fluent
       return string
     end
 
-    def generate_zremrangebyrank_script(key, maxlen, order)
-      script  = "local key = '" + key.to_s + "'\n"
-      script += "local maxlen = " + maxlen.to_s + "\n"
-      script += "local order ='" + order.to_s + "'\n"
-      script += "local len = tonumber(redis.call('ZCOUNT', key, '-inf', '+inf'))\n"
-      script += "if len > maxlen then\n"
-      script += "    if order == 'asc' then\n"
-      script += "       local l = len - maxlen\n"
-      script += "       if l >= 0 then\n"
-      script += "           return redis.call('ZREMRANGEBYRANK', key, 0, l)\n"
-      script += "       end\n"
-      script += "    else\n"
-      script += "       return redis.call('ZREMRANGEBYRANK', key, maxlen, -1)\n"
-      script += "    end\n"
-      script += "end\n"
-      return script
-    end
-
-    def generate_ltrim_script(key, maxlen, order)
-      script  = "local key = '" + key.to_s + "'\n"
-      script += "local maxlen = " + maxlen.to_s + "\n"
-      script += "local order ='" + order.to_s + "'\n"
-      script += "local len = tonumber(redis.call('LLEN', key))\n"
-      script += "if len > maxlen then\n"
-      script += "    if order == 'asc' then\n"
-      script += "        local l = len - maxlen\n"
-      script += "        return redis.call('LTRIM', key, l, -1)\n"
-      script += "    else\n"
-      script += "        return redis.call('LTRIM', key, 0, maxlen - 1)\n"
-      script += "    end\n"
-      script += "end\n"
-      return script
-    end
-
     def traverse(data, key)
       val = data
       key.split('.').each{ |k|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redis-store-wejick
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - wejick
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,8 +67,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Redis(zset/set/list/string/publish) output plugin for Fluentd, in the
-  process to adding more functionality (not stable)...
+description: Redis(zset/set/list/string/publish) output plugin for Fluentd...
 email: wejick@gmail.com
 executables: []
 extensions: []
@@ -102,11 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Redis(zset/set/list/string/publish) output plugin for Fluentd (in heavy dev,
-  contains config breaking change)
+summary: Redis(zset/set/list/string/publish) output plugin for Fluentd
 test_files:
 - test/helpers.rb
 - test/plugin/test_out_redis_publish.rb