data_collector 0.42.0 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882f493242fb171054818f0afe724c6389920c1a9590777a3d693a5638a3a0c3
-  data.tar.gz: 28b47fcd8de7c19d407cfeb49d7ca24a2f9199f88dfa167dce39fbb86fb3744c
+  metadata.gz: c289298a8de94ccad3a239ed6d05bf33db68c36072015f8bdb2d2a857809bd0f
+  data.tar.gz: 1f30741dd80b5cabbf9062869260d319c9db647facec1de41fa8921640967600
 SHA512:
-  metadata.gz: 91c0b362b95077a286ad47ed526889e10a053dd93c691963f2957350e9d5b956d4703d893bcce507db6f60feb35f5a8026d260e90c83bbcd7ceb657143be6df9
-  data.tar.gz: 6a4c1340f09916a83a351330ae7ede7f4b0538a5f8aae84ea365409dafb66a033df421baf27282dc22ccedee7c165f0a5e1365a69e680c127b2c6bbacfb7a045
+  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,6 +49,7 @@ module DataCollector
             if v.is_a?(Array) # merge with array
               @data[k] = [@data[k]] + v
             else
+              #@data[k] = [@data[k], v]
               @data[k] = v
             end
           end

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.42.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.42.0
+  version: 0.44.0
 platform: ruby
 authors:
 - Mehmet Celik