Merge branch 'master' into issue/17

.gitignore

@@ -1,4 +1,4 @@
 .*.swp
 *.gem
 local
-
+test/setup/elasticsearch/elasticsearch-*

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2009-2010 Jordan Sissel, Pete Fritchman, and contributors.
+Copyright 2009-2011 Jordan Sissel, Pete Fritchman, and contributors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

lib/logstash/inputs/amqp.rb

@@ -38,7 +38,6 @@ class LogStash::Inputs::Amqp < LogStash::Inputs::Base
       :vhost => (@vhost or "/"),
       :host => @url.host,
       :port => (@url.port or 5672),
-      :logging => true
     }
     amqpsettings[:user] = @url.user if @url.user
     amqpsettings[:pass] = @url.password if @url.password

lib/logstash/outputs/amqp.rb

@@ -36,7 +36,6 @@ class LogStash::Outputs::Amqp < LogStash::Outputs::Base
       :vhost => (@vhost or "/"),
       :host => @url.host,
       :port => (@url.port or 5672),
-      :logging => true
     }
     amqpsettings[:user] = @url.user if @url.user
     amqpsettings[:pass] = @url.password if @url.password

lib/logstash/outputs/stdout.rb

@@ -6,12 +6,26 @@ class LogStash::Outputs::Stdout < LogStash::Outputs::Base
   config :debug => :boolean
 
   public
-  def register
-    # nothing to do
+  def initialize(*args)
+    super
+
+    @opts = {}
+    if @url.path != "/"
+      @opts = @url.path[1..-1].split(",")
+    end
   end # def register
 
   public
   def receive(event)
-    puts event
+    if debug?
+      ap event
+    else
+      puts event
+    end
   end # def event
+
+  public
+  def debug?
+    return @opts.member?("debug")
+  end
 end # class LogStash::Outputs::Stdout