fluent-plugin-jabber 0.1.0 → 0.1.1

data/README.md

@@ -34,7 +34,17 @@ See source for details.
       password pa55w0rd
 
       # Output target JID. Currently multi user chat only.
-      room test@conference.localhost/test
+      #
+      # NOTE: Group chat could'nt accept nickname that already in used.
+      # It cause "conflict: That nickname is registered by another person" error.
+      # To prevent it, specify unique nickname per plugin definition.
+      room test@conference.localhost/unique_nickname
+
+      format Hello!\n${user.name} # ${user.name} replaced with record['user']['name']
+
+      # Enable detailed log of XMPP4R
+      jabber_debug_log true
+      jabber_warnings_log true
     </match>
 
 ### Message format
@@ -53,6 +63,11 @@ If 'body' field not set, the plugin raises error.
 
 ## Changes
 
+### 0.1.1
+
+* Fix Encoding::CompatibilityError while parsing XMPP messages caused by default_internal is ASCII_8BIT.
+* add jabber_debug_log and jabber_warnings_log options.
+
 ### 0.1.0
 
 * Add license

data/fluent-plugin-jabber.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-jabber"
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["todesking"]
   gem.email         = ["discommunicative@gmail.com"]
   gem.summary       = %q{Fluentd output plugin for XMPP(Jabber) protocol}

data/lib/fluent/plugin/out_jabber.rb

@@ -7,6 +7,16 @@ require 'xmpp4r/muc'
 
 require 'pit'
 
+# Deal with Fluentd's Encoding.default_internal = 'ASCII_8BIT'.
+class ::REXML::IOSource
+  alias orig_readline readline
+  def readline(*args)
+    line = orig_readline(*args)
+    line = line.force_encoding(::Encoding::UTF_8) if line.encoding == ::Encoding::ASCII_8BIT
+    line
+  end
+end
+
 class Fluent::JabberOutput < Fluent::Output
   Fluent::Plugin.register_output('jabber', self)
 
@@ -19,6 +29,11 @@ class Fluent::JabberOutput < Fluent::Output
 
   config_param :format, :string
 
+  # Enable error/warning logs of XMPP4R
+  # This configuration is global
+  config_param :jabber_debug_log, :bool, default: false
+  config_param :jabber_warnings_log, :bool, default: false
+
   attr_reader :jid
   attr_reader :password
 
@@ -35,6 +50,9 @@ class Fluent::JabberOutput < Fluent::Output
       @jid = user_info['jid']
       @password = user_info['password']
     end
+
+    Jabber.debug = true if jabber_debug_log
+    Jabber.warnings = true if jabber_warnings_log
   end
 
   def start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jabber
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -109,9 +109,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Fluentd output plugin for XMPP(Jabber) protocol
 test_files:
 - spec/out_jabber_spec.rb
+has_rdoc: