Always use codec

Always use codec to format the message part. Detects if the codec
is unchanged (plain with no formating set). If this is the case,
the config-option 'message' is used as format for the plain codec.

Author: Lucas Bremgartner

lib/logstash/outputs/syslog.rb

@@ -2,6 +2,7 @@
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "date"
+require "logstash/codecs/plain"
 
 
 # Send events to a syslog server.
@@ -94,11 +95,14 @@ class LogStash::Outputs::Syslog < LogStash::Outputs::Base
   # syslog message format: you can choose between rfc3164 or rfc5424
   config :rfc, :validate => ["rfc3164", "rfc5424"], :default => "rfc3164"
 
-  # use codec to format message (instead of setting message)
-  config :usecodec, :validate => :boolean, :default => false
-
   def register
     @client_socket = nil
+
+    if @codec.instance_of? LogStash::Codecs::Plain
+      if @codec.config["format"].nil?
+        @codec = LogStash::Codecs::Plain.new({"format" => @message})
+      end
+    end
     @codec.on_event(&method(:publish))
 
     facility_code = FACILITY_LABELS.index(@facility)
@@ -110,23 +114,15 @@ def register
   end
 
   def receive(event)
-    if @usecodec
-      @codec.encode(event)
-    else
-      publish(event, nil)
-    end
+    @codec.encode(event)
   end
 
   def publish(event, payload)
     appname = event.sprintf(@appname)
     procid = event.sprintf(@procid)
     sourcehost = event.sprintf(@sourcehost)
 
-    if payload.nil?
-      message = event.sprintf(@message)
-    else
-      message = payload.to_s.gsub(/[\n]/, '\n')
-    end
+    message = payload.to_s.gsub(/[\n]/, '\n')
 
     if @is_rfc3164
       timestamp = event.sprintf("%{+MMM dd HH:mm:ss}")

logstash-output-syslog.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
+  s.add_runtime_dependency 'logstash-codec-plain'
 
   s.add_development_dependency 'logstash-devutils'
-  s.add_development_dependency 'logstash-codec-plain'
   s.add_development_dependency 'logstash-codec-json'
 end
 

spec/outputs/syslog_spec.rb

@@ -2,6 +2,7 @@
 
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/syslog"
+require "logstash/codecs/plain"
 
 describe LogStash::Outputs::Syslog do
 
@@ -48,15 +49,16 @@
     it_behaves_like "syslog output"
   end
 
-  context "use codec by default plain)" do
-    let(:options) { {"host" => "foo", "port" => "123", "facility" => "kernel", "severity" => "emergency", "usecodec" => true } }
-    let(:output) { /^<0>.+baz LOGSTASH\[-\]: [0-9TZ:.+-]+ baz bar\n/m }
+  context "use plain codec with format set" do
+    let(:plain) { LogStash::Codecs::Plain.new({"format" => "%{host} %{message}"}) }
+    let(:options) { {"host" => "foo", "port" => "123", "facility" => "kernel", "severity" => "emergency", "codec" => plain} }
+    let(:output) { /^<0>.+baz LOGSTASH\[-\]: baz bar\n/m }
 
     it_behaves_like "syslog output"
   end
 
   context "use codec json" do
-    let(:options) { {"host" => "foo", "port" => "123", "facility" => "kernel", "severity" => "emergency", "usecodec" => true, "codec" => "json" } }
+    let(:options) { {"host" => "foo", "port" => "123", "facility" => "kernel", "severity" => "emergency", "codec" => "json" } }
     let(:output) { /^<0>.+baz LOGSTASH\[-\]: {\"message\":\"bar\",\"host\":\"baz\",\"@version\":\"1\",\"@timestamp\":\"[0-9TZ:.+-]+\"}\n/m }
 
     it_behaves_like "syslog output"