fluent-plugin-hipchat 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41892c64df61d3496d02924d73f14089e969ab09
-  data.tar.gz: 4d7545f990da26894984c0eb2e7148a7bf98567b
+  metadata.gz: 7e1eaf019c429076398ea4723cfeb6c5d6db6dc5
+  data.tar.gz: 7cfe131f2ebb925e8d5de5787114301c9c0e37f2
 SHA512:
-  metadata.gz: 0645335bd45ddafe75bd9fd034568a05083ef691408f2ab954ecd37b52b7f476744090b2ba3262b9c196444259e0e2528e03d71795eb484cf56e47f758d73476
-  data.tar.gz: f8883ccf6e965bf0eb74b24c64a224d005a8f4eefb09637405308f516613e1eb524ae1eca7a5b414369973e2fc5085507a1a575a783ff236ca9b900beeed3192
+  metadata.gz: 9198b96a460c242756c0d6f324f6e2b52e2c1e1aedfb843ed78e3f357f7196eff45bdf671813cfa1d44145149b66ce93ef66ba4da3efced2ec77e4aca0d714a7
+  data.tar.gz: 6e47b1a66401e702ee17bc76541229a3dc485cb4da56e172dcbe27c37edac9d5ea4dcc23d4026abb72dffd189fbb8b0163295fb82a8ecf7fbfef54b1ba58f496

data/README.rdoc

@@ -16,6 +16,8 @@
       default_color yellow
       default_notify 0
       default_format html
+      default_timeout 3  # HipChat API Request Timeout Seconds (default 3)
+      key_name message
       
       # proxy settings
       # http_proxy_host localhost

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/fluent/plugin/out_hipchat.rb

@@ -11,6 +11,8 @@ module Fluent
     config_param :default_from, :string, :default => nil
     config_param :default_notify, :bool, :default => nil
     config_param :default_format, :string, :default => nil
+    config_param :key_name, :string, :default => 'message'
+    config_param :default_timeout, :time, :default => nil
     config_param :http_proxy_host, :string, :default => nil
     config_param :http_proxy_port, :integer, :default => nil
     config_param :http_proxy_user, :string, :default => nil
@@ -33,6 +35,7 @@ module Fluent
       @default_notify = conf['default_notify'] || 0
       @default_color = conf['default_color'] || 'yellow'
       @default_format = conf['default_format'] || 'html'
+      @default_timeout = conf['default_timeout']
       if conf['http_proxy_host']
         HipChat::API.http_proxy(
           conf['http_proxy_host'],
@@ -49,7 +52,7 @@ module Fluent
     def write(chunk)
       chunk.msgpack_each do |(tag,time,record)|
         begin
-          send_message(record) if record['message']
+          send_message(record) if record[@key_name]
           set_topic(record) if record['topic']
         rescue => e
           $log.error("HipChat Error:", :error_class => e.class, :error => e.message)
@@ -60,7 +63,7 @@ module Fluent
     def send_message(record)
       room = record['room'] || @default_room
       from = record['from'] || @default_from
-      message = record['message']
+      message = record[@key_name]
       if record['notify'].nil?
         notify = @default_notify
       else
@@ -68,8 +71,9 @@ module Fluent
       end
       color = COLORS.include?(record['color']) ? record['color'] : @default_color
       message_format = FORMAT.include?(record['format']) ? record['format'] : @default_format
+      @hipchat.set_timeout(@default_timeout.to_i) unless @default_timeout.nil?
       response = @hipchat.rooms_message(room, from, message, notify, color, message_format)
-      raise StandardError, response['error']['message'].to_s if defined?(response['error']['message'])
+      raise StandardError, response['error'][@key_name].to_s if defined?(response['error'][@key_name])
     end
 
     def set_topic(record)
@@ -77,7 +81,7 @@ module Fluent
       from = record['from'] || @default_from
       topic = record['topic']
       response = @hipchat.rooms_topic(room, topic, from)
-      raise StandardError, response['error']['message'].to_s if defined?(response['error']['message'])
+      raise StandardError, response['error'][@key_name].to_s if defined?(response['error'][@key_name])
     end
   end
 end

data/test/plugin/out_hipchat.rb

@@ -39,6 +39,17 @@ class HipchatOutputTest < Test::Unit::TestCase
     d.run
   end
 
+  def test_set_default_timeout
+    d = create_driver(<<-EOF)
+                      type hipchat
+                      api_token xxx
+                      default_timeout 5
+                      EOF
+    stub(d.instance.hipchat).set_timeout(5)
+    d.emit({'message' => 'foo'})
+    d.run
+  end
+
   def test_message
     d = create_driver
     stub(d.instance.hipchat).rooms_message('testroom', 'testuser', 'foo', 0, 'red', 'html')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-hipchat
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Yuichi Tateno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd