github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1179 from jordansissel/improve-e-flag

Browse source 
Allow -f and -e flags together.
This commit is contained in:
Jordan Sissel 2014-03-18 15:29:32 -07:00
commit ac0ed3540f
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/logstash/agent.rb
View file

@ -10,7 +10,7 @@ class LogStash::Agent < Clamp::Command
option "-e", "CONFIG_STRING", option "-e", "CONFIG_STRING",
I18n.t("logstash.agent.flag.config-string"), I18n.t("logstash.agent.flag.config-string"),
:attribute_name => :config_string :default => "", :attribute_name => :config_string
option ["-w", "--filterworkers"], "COUNT", option ["-w", "--filterworkers"], "COUNT",
I18n.t("logstash.agent.flag.filterworkers"), I18n.t("logstash.agent.flag.filterworkers"),
@ -90,7 +90,10 @@ class LogStash::Agent < Clamp::Command
end end
if @config_path if @config_path
@config_string = load_config(@config_path) # Append the config string.
# This allows users to provide both -f and -e flags. The combination
# is rare, but useful for debugging.
@config_string += load_config(@config_path)
else else
# include a default stdin input if no inputs given # include a default stdin input if no inputs given
if @config_string !~ /input *{/ if @config_string !~ /input *{/