Fix bug in index type naming found by the test suite.

Author: jordansissel

lib/logstash/outputs/elasticsearch.rb

@@ -302,13 +302,20 @@ def start_local_elasticsearch
   public
   def receive(event)
     return unless output?(event)
-    buffer_receive([event, event.sprintf(@index), event.sprintf(@index_type)])
+    buffer_receive([event, index, type])
   end # def receive
 
   def flush(events, teardown=false)
     request = @client.bulk
     events.each do |event, index, type|
-      type = "logs" if type.empty?
+      index = event.sprintf(@index)
+
+      # Set the 'type' value for the index.
+      if @index_type.nil?
+        type =  event["type"] || "logs"
+      else
+        type = event.sprintf(@index_type)
+      end
       if @document_id
         request.index(index, type, event.sprintf(@document_id), event.to_json)
       else