fluent-plugin-munin 0.1.2 → 0.1.3

data/.gitignore

@@ -1,18 +1,4 @@
 *.gem
-*.rbc
 .bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
+Gemfile.lock
+pkg/*

data/fluent-plugin-munin.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-munin"
-  s.version     = "0.1.2"
+  s.version     = "0.1.3"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-munin"
@@ -17,4 +17,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "fluentd"
   s.add_runtime_dependency "fluentd"
+  s.add_runtime_dependency "munin-ruby"
 end

data/lib/fluent/plugin/in_munin.rb

@@ -16,12 +16,12 @@ module Fluent
 
     def configure(conf)
       super
+      @hostname = get_munin_hostname
       service_list = get_service_list
-      $log.info "munin-node #{@munin.nodes.join(',')} provides #{service_list}"
+      $log.info "munin-node #{@hostname} provides #{service_list}"
       @interval = Config.time_value(@interval)
       @services = @service == 'all' ? service_list : @service.split(',')
       @record_hostname = @record_hostname || false
-      @hostname = @munin.nodes.join(',')
     end
 
     def start
@@ -58,6 +58,16 @@ module Fluent
       @munin.connection.close
     end
 
+    def get_munin_hostname
+      @munin ||= get_connection
+      begin
+        return @munin.nodes.join(',')
+      rescue Munin::ConnectionError
+        @munin = get_connection
+        retry
+      end
+    end
+
     def get_service_list
       @munin ||= get_connection
       begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-munin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &8489320 !ruby/object:Gem::Requirement
+  requirement: &9216120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8489320
+  version_requirements: *9216120
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &8488100 !ruby/object:Gem::Requirement
+  requirement: &9214620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8488100
+  version_requirements: *9214620
+- !ruby/object:Gem::Dependency
+  name: munin-ruby
+  requirement: &9213740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *9213740
 description: 
 email:
 - y.ken.studio@gmail.com
@@ -42,7 +53,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - fluent-plugin-munin.gemspec

data/Gemfile.lock

@@ -1,31 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fluent-plugin-munin (0.1.2)
-      fluentd
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    cool.io (1.1.0)
-      iobuffer (>= 1.0.0)
-    fluentd (0.10.26)
-      cool.io (~> 1.1.0)
-      http_parser.rb (~> 0.5.1)
-      json (>= 1.4.3)
-      msgpack (~> 0.4.4)
-      yajl-ruby (~> 1.0)
-    http_parser.rb (0.5.3)
-    iobuffer (1.1.2)
-    json (1.7.5)
-    msgpack (0.4.7)
-    munin-ruby (0.2.3)
-    yajl-ruby (1.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fluent-plugin-munin!
-  fluentd
-  munin-ruby