Skip to content

Commit

Permalink
Call the setting 'user' to align with what almost every other plugin
Browse files Browse the repository at this point in the history
calls that thing.
  • Loading branch information
jordansissel committed Dec 10, 2013
1 parent eec18f6 commit 2468ae3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/logstash/outputs/elasticsearch_http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class LogStash::Outputs::ElasticSearchHTTP < LogStash::Outputs::Base
config :port, :validate => :number, :default => 9200

# The HTTP Basic Auth username used to access your elasticsearch server.
config :username, :validate => :string, :default => nil
config :user, :validate => :string, :default => nil

# The HTTP Basic Auth password used to access your elasticsearch server.
config :password, :validate => :password, :default => nil
Expand Down Expand Up @@ -83,7 +83,7 @@ def register
@agent = FTW::Agent.new
@queue = []

auth = @username && @password ? "#{@username}:#{@password.value}@" : ""
auth = @user && @password ? "#{@user}:#{@password.value}@" : ""
@bulk_url = "http://#{auth}#{@host}:#{@port}/_bulk?replication=#{@replication}"
if @manage_template
@logger.info("Automatic template configuration enabled", :manage_template => @manage_template.to_s)
Expand Down
2 changes: 1 addition & 1 deletion lib/logstash/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# encoding: utf-8
# The version of logstash.
LOGSTASH_VERSION = "1.2.3.dev"
LOGSTASH_VERSION = "1.3.0.dev"

# Note to authors: this should not include dashes because 'gem' barfs if
# you include a dash in the version string.

0 comments on commit 2468ae3

Please sign in to comment.