fluent-plugin-site24x7 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f64dbce42d3ac7dc65c2e58daf74be07be8657c7cb9ec81089a0212cb15509b
-  data.tar.gz: b4732542ec17f5bb32d34dc218ae5c4e1b12064978d46ba3d0dec591d5be8115
+  metadata.gz: c2391265977dd8a33dde6dab1876296406fae59c7633aa0ec0045821bb5688f1
+  data.tar.gz: 6bd7a51fca919c3c38c4f12cf226f403772c473d12f8c2a716f72ccb844f5ec7
 SHA512:
-  metadata.gz: b5a1be07bed5a2f8aa0d4f5ea6572fd7ed4dc1cb635cca6b5f7329418d46aebc1bc6278a5f9823705f05e373a03fcffaec7bdc63a9040f2ba832e14bf33ef342
-  data.tar.gz: 8ef90d45f72943d151cbeed6121043c3c3c47a956f50a4c6a702bc91d79d30e627a61007985036c09cd7f5d6322c88a46557303cca7334ff147cf2734e956def
+  metadata.gz: aab17017da06b62df8c7ebc8b2ee5e045e9833687945fd1f262890bd32bc9478f58208e1e07675e4295dd5c05fc6691bad50a19c35ea635c50d627438bb6dd01
+  data.tar.gz: de638056920dcc7cce4a00c1bddad3a4628ce5342e3b837e430d599f5f0db949ffcd81ff18efa55eca2e2d07b8dec761f3bd673367a076af3c69e8dcee6dd7ef

data/fluent-plugin-site24x7.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-site24x7"
-  spec.version = "0.1.1"
+  spec.version = "0.1.2"
   spec.authors = ["Magesh Rajan"]
   spec.email   = ["magesh.rajan@zohocorp.com"]
 

data/lib/fluent/plugin/out_site24x7.rb

@@ -64,8 +64,13 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
     @s247_http_client.shutdown if @s247_http_client
   end
 
+  def base64_url_decode(str)
+     str += '=' * (4 - str.length.modulo(4))
+     Base64.decode64(str.tr('-_','+/'))
+  end
+  
   def init_variables()
-    @logtype_config = Yajl::Parser.parse(Base64.decode64(@log_type_config))
+    @logtype_config = Yajl::Parser.parse(base64_url_decode(@log_type_config))
     @s247_custom_regex = if @logtype_config.has_key? 'regex' then Regexp.compile(@logtype_config['regex'].gsub('?P<','?<')) else nil end
     @s247_ignored_fields = if @logtype_config.has_key? 'ignored_fields' then @logtype_config['ignored_fields'] else [] end
     @s247_tz = {'hrs': 0, 'mins': 0} #UTC
@@ -76,12 +81,12 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
     @s247_datetime_format_string = @logtype_config['dateFormat']
     @s247_datetime_format_string = @s247_datetime_format_string.sub('%f', '%N')
     if !@s247_datetime_format_string.include? 'unix'
-      is_year_present = if @s247_datetime_format_string.include?('%y') || @s247_datetime_format_string.include?('%Y') then true else false end
-      if !is_year_present
+      @is_year_present = if @s247_datetime_format_string.include?('%y') || @s247_datetime_format_string.include?('%Y') then true else false end
+      if !@is_year_present
 	@s247_datetime_format_string = @s247_datetime_format_string+ ' %Y'
       end   
-      is_timezone_present = if @s247_datetime_format_string.include? '%z' then true else false end
-      if !is_timezone_present && @logtype_config.has_key?('timezone')
+      @is_timezone_present = if @s247_datetime_format_string.include? '%z' then true else false end
+      if !@is_timezone_present && @logtype_config.has_key?('timezone')
 	tz_value = @logtype_config['timezone']
 	if tz_value.start_with?('+')
 	    @s247_tz['hrs'] = Integer('-' + tz_value[1..4])
@@ -120,8 +125,8 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
         if @s247_datetime_format_string.include? 'unix'
             return (if @s247_datetime_format_string == 'unix' then datetime_string+'000' else datetime_string end)
         end
-        datetime_string += if !is_year_present then ' '+String(Time.new.year) else '' end
-        if !is_timezone_present
+        datetime_string += if !@is_year_present then ' '+String(Time.new.year) else '' end
+        if !@is_timezone_present && @logtype_config.has_key?('timezone')
             @s247_datetime_format_string += '%z'
             time_zone = String(@s247_tz['hrs'])+':'+String(@s247_tz['mins'])
             datetime_string += if time_zone.start_with?('-') then time_zone else '+'+time_zone end
@@ -150,6 +155,8 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
 		    formatted_line.merge!(log_fields)
                     parsed_lines.push(formatted_line)
 		    log_size -= removed_log_size
+                else
+                    log.debug "pattern not matched regex : #{@s247_custom_regex} and received line : #{line}"
 		end
 	    rescue Exception => e
 		log.error "Exception in parse_line #{e.backtrace}"
@@ -345,7 +352,7 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
           end
         end
       rescue Exception => e
-        log.error "Exception occurred in sendig logs : #{e}"
+        log.error "Exception occurred in sendig logs : #{e.backtrace}"
       end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-site24x7
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Magesh Rajan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler