in_syslog.rb in fluentd-0.12.21

- old
+ new

@@ -12,10 +12,17 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
 
+require 'cool.io'
+require 'yajl'
+
+require 'fluent/input'
+require 'fluent/config/error'
+require 'fluent/parser'
+
 module Fluent
   class SyslogInput < Input
     Plugin.register_input('syslog', self)
 
     SYSLOG_REGEXP = /^\<([0-9]+)\>(.*)/
@@ -58,36 +65,35 @@
       7  => 'debug'
     }
 
     def initialize
       super
-      require 'cool.io'
       require 'fluent/plugin/socket_util'
     end
 
     desc 'The port to listen to.'
-    config_param :port, :integer, :default => 5140
+    config_param :port, :integer, default: 5140
     desc 'The bind address to listen to.'
-    config_param :bind, :string, :default => '0.0.0.0'
+    config_param :bind, :string, default: '0.0.0.0'
     desc 'The prefix of the tag. The tag itself is generated by the tag prefix, facility level, and priority.'
     config_param :tag, :string
     desc 'The transport protocol used to receive logs.(udp, tcp)'
-    config_param :protocol_type, :default => :udp do |val|
+    config_param :protocol_type, default: :udp do |val|
       case val.downcase
       when 'tcp'
         :tcp
       when 'udp'
         :udp
       else
         raise ConfigError, "syslog input protocol type should be 'tcp' or 'udp'"
       end
     end
     desc 'If true, add source host to event record.'
-    config_param :include_source_host, :bool, :default => false
+    config_param :include_source_host, :bool, default: false
     desc 'Specify key of source host when include_source_host is true.'
-    config_param :source_host_key, :string, :default => 'source_host'.freeze
-    config_param :blocking_timeout, :time, :default => 0.5
+    config_param :source_host_key, :string, default: 'source_host'.freeze
+    config_param :blocking_timeout, :time, default: 0.5
 
     def configure(conf)
       super
 
       if conf.has_key?('format')
@@ -123,11 +129,11 @@
     end
 
     def run
       @loop.run(@blocking_timeout)
     rescue
-      log.error "unexpected error", :error=>$!.to_s
+      log.error "unexpected error", error: $!.to_s
       log.error_backtrace
     end
 
     private
 
@@ -148,27 +154,27 @@
 
         record[@source_host_key] = addr[2] if @include_source_host
         emit(pri, time, record)
       }
     rescue => e
-      log.error data.dump, :error => e.to_s
+      log.error data.dump, error: e.to_s
       log.error_backtrace
     end
 
     def receive_data(data, addr)
       @parser.parse(data) { |time, record|
         unless time && record
-          log.warn "invalid syslog message", :data => data
+          log.warn "invalid syslog message", data: data
           return
         end
 
         pri = record.delete('pri')
         record[@source_host_key] = addr[2] if @include_source_host
         emit(pri, time, record)
       }
     rescue => e
-      log.error data.dump, :error => e.to_s
+      log.error data.dump, error: e.to_s
       log.error_backtrace
     end
 
     private
 
@@ -190,9 +196,9 @@
 
       tag = "#{@tag}.#{facility}.#{priority}"
 
       router.emit(tag, time, record)
     rescue => e
-      log.error "syslog failed to emit", :error => e.to_s, :error_class => e.class.to_s, :tag => tag, :record => Yajl.dump(record)
+      log.error "syslog failed to emit", error: e.to_s, error_class: e.class.to_s, tag: tag, record: Yajl.dump(record)
     end
   end
 end