Merge branch 'master' of github.com:logstash/logstash

This commit is contained in:
Jordan Sissel 2011-05-12 10:47:05 -07:00
commit 2f5c551fda
2 changed files with 8 additions and 1 deletions

View file

@ -1,4 +1,9 @@
1.0.??? (May 11, 2011)
1.0.7 ( ????? )
@ TODO: logstash-web needs to support elasticsearch cluster name
@ TODO: GELF 'dynamic' level/facility? (LOGSTASH-83)
@ TODO: Catch input exceptions and handle them sanely (LOGSTASH-84)
1.0.6 (May 11, 2011)
* Remove 'sigar' from monolithic jar packaging. This removes a boatload of
unnecessary warning messages on startup whenever you use elasticsearch
output or logstash-web.

View file

@ -36,6 +36,8 @@ class LogStash::Outputs::Gelf < LogStash::Outputs::Base
public
def receive(event)
# We have to make our own hash here because GELF expects a hash
# with a specific format.
m = Hash.new
m["short_message"] = (event.fields["message"] or event.message)
m["full_message"] = (event.message)