data_collector 0.43.0 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2c8102350695f8cfc598856372d9efd4bfa8b9cf4c3f84110b6dfbfdff3ee62
-  data.tar.gz: 042bf4690116ba07f34459068e3afbc7e63f483c7e0518ecb1581833cb85b3ae
+  metadata.gz: c289298a8de94ccad3a239ed6d05bf33db68c36072015f8bdb2d2a857809bd0f
+  data.tar.gz: 1f30741dd80b5cabbf9062869260d319c9db647facec1de41fa8921640967600
 SHA512:
-  metadata.gz: ff4a4c20f156dadbd665ff330f9c9f057a20391b2fc4fbab45afe59bb3071fd69aaaf6c67521b37a3d5d61b581761fcb21432be405d402a3571c32e47ce86f1b
-  data.tar.gz: a52836f02b727c1ed679520492921bfed09892d79155bf56fa2b823792a04512cfae267d15c22210acc32a460a8f2ed2a350e6ece388e860a41b0fbb473e778d
+  metadata.gz: ac4f4d7d8906f11ea0840cf416058a665ac2139fd6d3cd0057986624c702e1774fa752c6984ae08c0bc9754c0bfdf9c8fe553635d96ec14cbcc67641e4f95792
+  data.tar.gz: af893f7320eaa88ff7026f3a2a04e74cface4cd1858db450d6204baa73751b9d6e6c6b743f979319f5e277a7b213ec0ef2989180ae99d1c54921ac07bf2d1817

data/lib/data_collector/ext/base.rb

@@ -33,31 +33,32 @@ module BunnyBurrow
       :connection_name
     )
 
-    def initialize
-      @connection_name = "#{Process.pid}-#{SecureRandom.uuid}"
-    end
-    # private
-    #
-    # def connection
-    #   Connection.instance.connection_name = @connection_name
-    #   Connection.instance.verify_peer = @verify_peer
-    #   Connection.instance.rabbitmq_url = @rabbitmq_url
-    #
-    #   unless @connection
-    #     @connection = Connection.instance.connection
-    #     @connection.start unless @connection.open?
-    #   end
-    #
-    #   @connection
-    # end
-    #
-    # def channel
-    #   Connection.instance.connection_name = @connection_name
-    #   Connection.instance.verify_peer = @verify_peer
-    #   Connection.instance.rabbitmq_url = @rabbitmq_url
-    #
-    #   @channel = Connection.instance.channel
+    # def initialize
+    #   super
+    #   @connection_name = "#{Process.pid}-#{SecureRandom.uuid}"
     # end
+  #   private
+  #
+  #   def connection
+  #     Connection.instance.connection_name = @connection_name
+  #     Connection.instance.verify_peer = @verify_peer
+  #     Connection.instance.rabbitmq_url = @rabbitmq_url
+  #
+  #     unless @connection
+  #       @connection = Connection.instance.connection
+  #       @connection.start unless @connection.open?
+  #     end
+  #
+  #     @connection
+  #   end
+  #
+  #   def channel
+  #     Connection.instance.connection_name = @connection_name
+  #     Connection.instance.verify_peer = @verify_peer
+  #     Connection.instance.rabbitmq_url = @rabbitmq_url
+  #
+  #     @channel = Connection.instance.channel
+  #   end
   end
 end
 

data/lib/data_collector/output.rb

@@ -49,7 +49,8 @@ module DataCollector
             if v.is_a?(Array) # merge with array
               @data[k] = [@data[k]] + v
             else
-              @data[k] = [@data[k], v]
+              #@data[k] = [@data[k], v]
+              @data[k] = v
             end
           end
         else

data/lib/data_collector/rules_ng.rb

@@ -22,8 +22,16 @@ module DataCollector
 
       case rule
       when Array
+        odata = {}
         rule.each do |sub_rule|
-          apply_rule(tag, sub_rule, input_data, output_data, options)
+          d=apply_rule(tag, sub_rule, input_data, output_data, options)
+          next if d.nil?
+          odata.merge!(d) {|k,v, n|
+            [v,n].flatten
+          }
+        end
+        odata.each do |k,v|
+          output_data.data[k] = v
         end
         return output_data
       when String

data/lib/data_collector/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module DataCollector
-  VERSION = "0.43.0"
+  VERSION = "0.44.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.44.0
 platform: ruby
 authors:
 - Mehmet Celik