- have 'version' and 'version --verbose' work

This commit is contained in:
Jordan Sissel 2013-08-28 05:31:44 +00:00
parent def8247126
commit b7a582e539

View file

@ -90,7 +90,15 @@ class LogStash::Runner
def run(args) def run(args)
command = args.shift command = args.shift
commands = { commands = {
"version" => lambda { emit_version(args) }, "version" => lambda do
require "logstash/agent"
agent_args = ["--version"]
if args.include?("--verbose")
agent_args << "--verbose"
end
LogStash::Agent.run($0, agent_args)
return []
end,
"web" => lambda do "web" => lambda do
# Give them kibana. # Give them kibana.
require "logstash/kibana" require "logstash/kibana"
@ -220,11 +228,6 @@ class LogStash::Runner
return args return args
end # def run end # def run
def emit_version(args)
require "logstash/version"
puts "logstash #{LOGSTASH_VERSION}"
return []
end # def emit_version
end # class LogStash::Runner end # class LogStash::Runner
if $0 == __FILE__ if $0 == __FILE__