Merge remote branch 'origin/master'

README.md

@@ -2,7 +2,8 @@
 
 logstash is a tool for managing events and logs. You can use it to collect logs, parse them, and store them for later use (like, for searching). Speaking of searching, logstash comes with a web interface for searching and drilling into all of your logs.
 
-It is fully free and fully open source. The license is New BSD, meaning you are pretty much free to use it however you want in whatever way.
+It is fully free and fully open source. The license is Apache 2.0, meaning you
+are pretty much free to use it however you want in whatever way.
 
 For more info, see <http://logstash.net/>
 

docs/learn.md

@@ -35,8 +35,8 @@ for such things, that works for me, too.)
 
 logstash releases come in a few flavors.
 
-* [Monolithic jar](http://semicomplete.com/files/logstash/logstash-1.0.8-monolithic.jar)
-* [rubygem](http://rubygems.org/gems/logstash/versions/1.0.8)
+* [Monolithic jar](http://semicomplete.com/files/logstash/logstash-1.0.9-monolithic.jar)
+* [rubygem](http://rubygems.org/gems/logstash/versions/1.0.9)
 * [`gem install logstash`](http://rubygems.org/gems/logstash)
 
 ## What's next?

lib/logstash/runner.rb

@@ -1,28 +1,37 @@
 require "rubygems"
+require "logstash/namespace"
 
-$: << File.join(File.dirname(__FILE__), "../")
-command = ARGV.shift
+class LogStash::Runner
+  def self.main(args)
+    $: << File.join(File.dirname(__FILE__), "../")
+    command = args.shift
 
-commands = {
-  "agent" => proc do
-    require "logstash/agent"
-    agent = LogStash::Agent.new
-    agent.argv = ARGV
-    agent.run
-  end,
-  "web" => proc do
-    require "logstash/web/server"
-  end,
-  "test" => proc do
-    require "logstash_test_runner"
-  end
-}
+    commands = {
+      "agent" => proc do
+        require "logstash/agent"
+        agent = LogStash::Agent.new
+        agent.argv = args
+        agent.run
+      end,
+      "web" => proc do
+        require "logstash/web/server"
+      end,
+      "test" => proc do
+        require "logstash_test_runner"
+      end
+    }
 
-if commands.include?(command)
-  commands[command].call
-else
-  $stderr.puts "No such command #{command.inspect}"
-  $stderr.puts "Available commands:"
-  $stderr.puts commands.keys.map { |s| "  #{s}" }.join("\n")
-  exit 1
+    if commands.include?(command)
+      commands[command].call
+    else
+      $stderr.puts "No such command #{command.inspect}"
+      $stderr.puts "Available commands:"
+      $stderr.puts commands.keys.map { |s| "  #{s}" }.join("\n")
+      exit 1
+    end
+  end # def self.main
+end # class LogStash::Runner
+
+if $0 == __FILE__
+  LogStash::Runner.main(ARGV)
 end