fluent-plugin-cloudstack 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1812fc6dbf0444ed174e95b0196efa4cd2ad1d28
-  data.tar.gz: be664f8dfe00eedbb1c6cbe59153e0852338d781
+  metadata.gz: ccf8c72f2b2dce64fffca3ea87e2e3c40b2942b4
+  data.tar.gz: 198d9133f7389afb39060f3370f2157a4b4d425d
 SHA512:
-  metadata.gz: 9b502e1ecaf5a67d2317f3003bbcad7a7f9bcac56d13239e5046a7822c285688fc4e1214987b7a2638606157010994c3fdc58b7bd43692c4c2fdee169e3a655b
-  data.tar.gz: c2c6be6088f7d65b837011b73e9f985848f3dbe32e5ea8c18143325af4e04be18698ba365cedcdf4348685e8fd48a0832c1b4c7734313f9a9065754543a5a4e7
+  metadata.gz: 13de40b9ae392b6b400c7ff9f116b74d0676da594dc2109f1ca91d5f1e18fbcdefbb5ea3800f564de4e587079d1ec2c5cd21f30df0d7f901ec346af616e467f2
+  data.tar.gz: d8304d8fa925297b9ce7dbac4f8342f97a2b1ffd9415d9294528152d658461f0afb141182ef6c6f11a0adc1a46cf2abd89e1c59a1f2f4d6a3ad496c3c5588c9c

data/README.textile

@@ -53,6 +53,7 @@ h2. Configuration
   ssl $cloudtack_api_ssl               # true or false, default true
   domain_id $cloudstack_domain_id
   tag $fluentd_tag                     # default cloudstack
+  log_dir $fluentd_log_dir             # default /var/log/td_agent
 
   # debug mode
   debug_mode $boolean                  # default false

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/fluent/plugin/in_cloudstack.rb

@@ -2,6 +2,11 @@ module Fluent
   class CloudStackInput < Input
     Fluent::Plugin.register_input("cloudstack", self)
 
+    # To support log_level option implemented by Fluentd v0.10.43
+    unless method_defined?(:log)
+      define_method("log") { $log }
+    end
+
     INTERVAL_MIN = 300
 
     config_param :host
@@ -15,6 +20,7 @@ module Fluent
     config_param :tag,         :default => "cloudstack"
     config_param :ssl,         :default => true
     config_param :debug_mode,  :default => false
+    config_param :log_dir,     :default => '/var/log/td_agent'
     config_param :interval,    :default => INTERVAL_MIN
 
     attr_writer :before_events
@@ -42,7 +48,7 @@ module Fluent
         end
       end
 
-      @before_events_filepath = "logs/before_events.#{tag}.yml"
+      @before_events_filepath = "#{@log_dir}/before_events.#{tag}.yml"
 
       if File.exist?(@before_events_filepath)
         @before_events = YAML.load_file(@before_events_filepath)
@@ -50,7 +56,7 @@ module Fluent
         @before_events = nil
       end
 
-      @before_usages_filepath = "logs/before_usages.#{tag}.yml"
+      @before_usages_filepath = "#{@log_dir}/before_usages.#{tag}.yml"
       if File.exist?(@before_usages_filepath)
         @before_usages = YAML.load_file(@before_usages_filepath)
       else
@@ -66,7 +72,7 @@ module Fluent
       super
       run_reactor_thread
       @thread = Thread.new(&method(:run))
-      $log.info "listening cloudstack api on #{@host}"
+      log.info "listening cloudstack api on #{@host}"
     end
 
     def shutdown
@@ -82,8 +88,8 @@ module Fluent
           emit_new_events
           emit_usages
         rescue => ex
-          $log.warn("EM.periodic_timer loop error.")
-          $log.warn("#{ex}, tracelog : \n#{ex.backtrace.join("\n")}")
+          log.warn("EM.periodic_timer loop error.")
+          log.warn("#{ex}, tracelog : \n#{ex.backtrace.join("\n")}")
         end
       end
     end
@@ -212,8 +218,8 @@ module Fluent
     def init_eventmachine
       EM.epoll; EM.kqueue
       EM.error_handler do |ex|
-        $log.fatal("Eventmachine problem")
-        $log.fatal("#{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.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuichi UEMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Fluentd input plugin to get usages and events from CloudStack API