- finish up the agent2 conversion

Author: jordansissel

lib/logstash/agent.rb

@@ -1,7 +1,7 @@
 require "clamp" # gem 'clamp'
 require "logstash/errors"
 
-class LogStash::Agent2 < Clamp::Command
+class LogStash::Agent < Clamp::Command
   option ["-f", "--config"], "CONFIG_PATH",
     I18n.t("logstash.agent.flag.config"),
     :attribute_name => :config_path
@@ -241,4 +241,4 @@ def load_config(path)
     end
     return config
   end # def load_config
-end # class LogStash::Agent2
+end # class LogStash::Agent

lib/logstash/runner.rb

@@ -91,12 +91,6 @@ def run(args)
     command = args.shift
     commands = {
       "version" => lambda { emit_version(args) },
-      "agent" => lambda do
-        require "logstash/agent"
-        agent = LogStash::Agent.new
-        @runners << agent
-        return agent.run(args)
-      end,
       "web" => lambda do
         require "logstash/web/runner"
         web = LogStash::Web::Runner.new
@@ -173,7 +167,7 @@ def wait
         require "pry"
         return binding.pry
       end,
-      "agent2" => lambda do
+      "agent" => lambda do
         require "logstash/agent2"
         # Hack up a runner
         runner = Class.new do
@@ -182,7 +176,7 @@ def initialize(args)
           end
           def run
             @thread = Thread.new do
-              @result = LogStash::Agent2.run($0, @args)
+              @result = LogStash::Agent.run($0, @args)
             end
           end
           def wait