fluent-plugin-gelf-hs 1.0.4 → 1.0.5

data/lib/fluent/plugin/formatter_gelf.rb

@@ -4,6 +4,10 @@ module Fluent
   module TextFormatter
     class GELFFormatter < Formatter
 
+      unless method_defined?(:log)
+        define_method('log') { $log }
+      end
+
       Plugin.register_formatter("gelf", self)
 
       require 'fluent/gelf_util'
@@ -17,15 +21,26 @@ module Fluent
       end
 
       def format(tag, time, record)
-        gelfentry = make_gelfentry(
-          tag,time,record,
-          {
-            :use_record_host => @use_record_host,
-            :add_msec_time => @add_msec_time
-          }
-        )
-
-        make_json(gelfentry,{})
+
+        begin
+
+          gelfentry = make_gelfentry(
+            tag,time,record,
+            {
+              :use_record_host => @use_record_host,
+              :add_msec_time => @add_msec_time
+            }
+          )
+
+          make_json(gelfentry,{})
+      
+        rescue Exception => e
+          log.error sprintf(
+            'Error trying to serialize %s: %s',
+            record.to_s.force_encoding('UTF-8'),
+            e.message.to_s.force_encoding('UTF-8')
+          )
+        end
       end
 
     end

data/lib/fluent/plugin/out_gelf.rb

@@ -2,6 +2,10 @@ module Fluent
 
   class GELFOutput < BufferedOutput
 
+    unless method_defined?(:log)
+      define_method('log') { $log }
+    end
+
     Plugin.register_output("gelf", self)
 
     require 'gelf'
@@ -64,19 +68,36 @@ module Fluent
         timestamp = time
       end
 
-      make_gelfentry(
-        tag,time,record,
-        {
-          :use_record_host => @use_record_host,
-          :add_msec_time => @add_msec_time
-        }
-      ).to_msgpack
+      begin
+        make_gelfentry(
+          tag,time,record,
+          {
+            :use_record_host => @use_record_host,
+            :add_msec_time => @add_msec_time
+          }
+        ).to_msgpack
+      rescue Exception => e
+        log.error sprintf(
+          'Error trying to serialize %s: %s',
+          record.to_s.force_encoding('UTF-8'),
+          e.message.to_s.force_encoding('UTF-8')
+        )
+      end
 
     end
 
     def write(chunk)
       chunk.msgpack_each do |data|
-        @conn.notify!(data)
+        begin
+          @conn.notify!(data)
+        rescue Exception => e
+          log.error sprintf(
+            'Error trying to publish %s: %s',
+            data.to_s.force_encoding('UTF-8'),
+            e.message.to_s.force_encoding('UTF-8')
+          )
+        end
+
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fluent-plugin-gelf-hs
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Alex Yamauchi
@@ -42,7 +42,7 @@ cert_chain:
   2Zk648Ep9HVPKmwoVuB75+xEQw==
   -----END CERTIFICATE-----
 
-date: 2017-08-08 00:00:00 Z
+date: 2018-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fluentd