gri 10.0.6 → 10.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e8b36dc97ced45aa0de1a72697dcd52ff48e555
-  data.tar.gz: d0b0fbdab14c4dcd5fc35b6c079d1ddd371a8bde
+  metadata.gz: 4f65c5971ca81e3e40bb99b6c75fc9cb0e7abd13
+  data.tar.gz: 13ec94a6ae74dd7b05e54466df5549083dfd7c8b
 SHA512:
-  metadata.gz: b0cee0365f9753f8792bd614d5e591af2ef0dc49440e3392c4d652541c8de4bd5b63fd4a4a196a40c21e12027b8c9542a1dcdd0dd50b7492263cc82fd37a98f5
-  data.tar.gz: 0a22e850b4dbe14f60a76edbadfebffadf929acc5f1ef7796cedcd4331a17ef994688dbf9d5512e6b9066d507fa6f3055bd9d5311c0972ac1d07866bb0970891
+  metadata.gz: 961ec77bab123aba5882cc937722d62d8b9cfa6a18245b6b1664f5a90e4a0c26a30d63df7620340e88a1aceebb904f549f115d72fa5f60dfc14a113514659289
+  data.tar.gz: 80fdba8a08010d7d33fcc7247b0bd820fb83e7f6d440baf545ff8234e26391a80baff675c75b7d78dfb4dd132f29c9fdb70dc17b9cd8e0d12ad18b435faa23ed

data/lib/fluent/plugin/out_gri.rb

@@ -27,15 +27,20 @@ class GriOutput < BufferedOutput
 
   config_param :config_path, :string, :default=>'/usr/local/gri/gri.conf'
   config_param :gra_dir, :string, :default=>nil
+  config_param :log_level, :string, :default=>nil
+  config_param :interval, :integer, :default=>nil
 
   def start
     super
-    #::Log.init '/tmp/fluent.log'
+    if @log_level
+      ::Log.init '/tmp/out_gri.log', :log_level=>@log_level
+    end
     GRI::Config.init @config_path
     root_dir = GRI::Config['root-dir'] ||= GRI::Config::ROOT_PATH
     plugin_dirs = GRI::Config.getvar('plugin-dir') || [root_dir + '/plugin']
     GRI::Plugin.load_plugins plugin_dirs
     @gra_dir ||= GRI::Config['gra-dir'] || root_dir + '/gra'
+    @interval ||= (GRI::Config['interval'] || 300).to_i
   end
 
   def format tag, time, record
@@ -47,7 +52,7 @@ class GriOutput < BufferedOutput
     chunk.msgpack_each {|tag, time, record|
       records.push record
     }
-    writer = GRI::Writer.create 'rrd', :gra_dir=>@gra_dir
+    writer = GRI::Writer.create 'rrd', :gra_dir=>@gra_dir, :interval=>@interval
     writer.write records
     writer.finalize
   end

data/lib/gri/plugin.rb

@@ -17,8 +17,9 @@ module GRI
           path = File.join dir, fname
           begin
             require path
+            Log.debug "load plugin: '#{path}'"
           rescue LoadError
-            Log.error "LoadError: #{$!}"
+            Log.debug "LoadError: #{$!}"
             puts "LoadError: #{$!}" if $debug
           end
           @loaded[fname] = path

data/lib/gri/updater.rb

@@ -130,6 +130,7 @@ module GRI
       unless @rrd
         data_name = options[:data_name]
         @specs = DEFS.get_specs data_name
+        Log.debug "update host=#{options[:host]} data=#{data_name}"
         return unless @specs # unknown data_name
         return unless @specs[:ds]
         #if (index_key = (@specs[:index_key] || @specs[:named_index]) and
@@ -147,6 +148,7 @@ module GRI
       end
       data = @record_keys.map {|key| record[key]}
       s = "#{time.to_i}:#{mk_update_str data}"
+      Log.debug "update key=#{@key} rrd data=#{s}"
       @rrd.buffered_update s
 
       if (prop = @specs[:prop]) and (descr_k = prop[:description]) and

data/lib/gri/utils.rb

@@ -36,7 +36,9 @@ module GRI
       if File.exist? path
         values = LTSV.load_from_file path
         nvalues = values.inject({}) {|h, v| h[v[key]] = v; h}
-        nvalues.merge! other
+        for k in other.keys
+          nvalues[k] ? nvalues[k].merge!(other[k]) : (nvalues[k] = other[k])
+        end
       else
         nvalues = other
       end

data/lib/gri/version.rb

@@ -1,3 +1,3 @@
 module GRI
-  VERSION = "10.0.6"
+  VERSION = "10.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gri
 version: !ruby/object:Gem::Version
-  version: 10.0.6
+  version: 10.0.7
 platform: ruby
 authors:
 - maebashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack