From 0a18b460039e792dd6a4dc5fce050a19f8606ef0 Mon Sep 17 00:00:00 2001 From: Jordan Sissel Date: Wed, 17 Aug 2011 19:32:50 -0700 Subject: [PATCH] - every other plugin calls it a user, so just say user. --- lib/logstash/inputs/xmpp.rb | 4 ++-- lib/logstash/outputs/xmpp.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/logstash/inputs/xmpp.rb b/lib/logstash/inputs/xmpp.rb index bb221cbc0..6cf0a4fa5 100644 --- a/lib/logstash/inputs/xmpp.rb +++ b/lib/logstash/inputs/xmpp.rb @@ -6,7 +6,7 @@ class LogStash::Inputs::Xmpp < LogStash::Inputs::Base config_name "xmpp" # The user or resource ID, like foo@example.com. - config :identity, :validate => :string, :required => :true + config :user, :validate => :string, :required => :true # The xmpp password for the JID. config :password, :validate => :password, :required => :true @@ -28,7 +28,7 @@ class LogStash::Inputs::Xmpp < LogStash::Inputs::Base require 'xmpp4r' # xmpp4r gem Jabber::debug = true if @debug - @client = Jabber::Client.new(Jabber::JID.new(@identity)) + @client = Jabber::Client.new(Jabber::JID.new(@user)) @client.connect(@host) # it is ok if host is nil @client.auth(@password.value) @client.send(Jabber::Presence.new.set_type(:available)) diff --git a/lib/logstash/outputs/xmpp.rb b/lib/logstash/outputs/xmpp.rb index def7523c3..a27d3f3a3 100644 --- a/lib/logstash/outputs/xmpp.rb +++ b/lib/logstash/outputs/xmpp.rb @@ -7,7 +7,7 @@ class LogStash::Outputs::Xmpp < LogStash::Outputs::Base config_name "xmpp" # The user or resource ID, like foo@example.com. - config :identity, :validate => :string, :required => :true + config :user, :validate => :string, :required => :true # The xmpp password for the JID. config :password, :validate => :password, :required => :true @@ -31,7 +31,7 @@ class LogStash::Outputs::Xmpp < LogStash::Outputs::Base public def connect Jabber::debug = true - client = Jabber::Client.new(Jabber::JID.new(@identity)) + client = Jabber::Client.new(Jabber::JID.new(@user)) client.connect(@host) client.auth(@password.value) return client