fluent-plugin-cloudstack 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec43570ad8d36ae5a93b602fc89d77de5d0cbcac
-  data.tar.gz: d7ec531dd7bb504cf49a81f3c14b210da873e6d2
+  metadata.gz: a115cbfeb601c38d2ce53ab1d5ab9d96f3e49bc6
+  data.tar.gz: 3ad059798f4d5387a76e9bf1b9bc57bf08ab2254
 SHA512:
-  metadata.gz: b40c4a9006bddc2c70b2e0f64d459153b55d08d97038258be3d2a809a1976928228de25e02319a0a279d99c50fd47978707fcb8b45ce0b4b08bb371b64c6098f
-  data.tar.gz: e21241dce0a24a0f7d7d70193c9eda9183fafdae18a74cf98ff90f2c2d7cc4f39a40c3518ae590cf5247669c0874509100cb45f6e3b5d2d9d2c21edf6ab40e97
+  metadata.gz: 23db5e5f0c4bfe74750544ba828daf0193fd715bdbccc746f45ec4596dccec4bcbebcb13a7b49c4084f4707d96e9ec2e58846aeb8c196d238808021a61a78162
+  data.tar.gz: 639d6d41cb148b1e54698adf576f16b79c3941506e67f2ab1998d951f187686d63414d3ecead0ea4520a4d181d9ea477798657e3874ca5818ed9fad9a7cc656d

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/fluent/plugin/in_cloudstack.rb

@@ -15,6 +15,7 @@ module Fluent
 
     config_param :tag, :string, :default => "cloudstack"
     config_param :ssl, :bool, :default => true
+    config_param :debug_mode, :bool, :default => false
 
     attr_writer :before_events
 
@@ -30,15 +31,18 @@ module Fluent
       super
 
       @conf = conf
+
       unless @host && @apikey && @secretkey
         raise ConfigError, "'host' and 'apikey' and 'secretkey' must be all specified."
       end
 
-      if @interval < INTERVAL_MIN
-        raise ConfigError, "'interval' must be over #{INTERVAL_MIN}."
+      unless @debug_mode
+        if @interval.to_i < INTERVAL_MIN
+          raise ConfigError, "'interval' must be over #{INTERVAL_MIN}."
+        end
       end
 
-      @before_events_filepath = "logs/before_events.yml"
+      @before_events_filepath = "logs/before_events.#{tag}.yml"
 
       if File.exist?(@before_events_filepath)
         @before_events = YAML.load_file(@before_events_filepath)
@@ -46,7 +50,7 @@ module Fluent
         @before_events = nil
       end
 
-      @before_usages_filepath = "logs/before_usages.yml"
+      @before_usages_filepath = "logs/before_usages.#{tag}.yml"
       if File.exist?(@before_usages_filepath)
         @before_usages = YAML.load_file(@before_usages_filepath)
       else
@@ -74,8 +78,13 @@ module Fluent
 
     def run
       EM.add_periodic_timer(@interval) do
-        emit_new_events
-        emit_usages
+        begin
+          emit_new_events
+          emit_usages
+        rescue => ex
+          $log.warn("EM.periodic_timer loop error.")
+          $log.warn("#{ex}, tracelog : \n#{ex.backtrace.join("\n")}")
+        end
       end
     end
 
@@ -90,6 +99,8 @@ module Fluent
     end
 
     def emit_usages
+      usages = get_usages
+
       Engine.emit("#{@usages_output_tag}", Engine.now, get_usages)
     end
 
@@ -151,7 +162,7 @@ module Fluent
         end
       end
 
-      usages = @before_usages
+      usages = Hash.new
 
       usages[:vm_sum]          = vms.size
       usages[:memory_sum]      = memory_sum
@@ -166,6 +177,12 @@ module Fluent
         usages[key] = value
       end
 
+      @before_usages.each do |key,value|
+        unless usages.key?(key)
+          usages[key] = 0
+        end
+      end
+
       File.write(@before_usages_filepath, usages.to_yaml)
       @before_usages = usages
 
@@ -195,8 +212,8 @@ module Fluent
     def init_eventmachine
       EM.epoll; EM.kqueue
       EM.error_handler do |ex|
-        $log.error("Eventmachine problem")
-        $log.error("#{ex}, tracelog : \n#{ex.backtrace.join("\n")}")
+        $log.fatal("Eventmachine problem")
+        $log.fatal("#{ex}, tracelog : \n#{ex.backtrace.join("\n")}")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Yuichi UEMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd