fluent-plugin-site24x7 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc1338accf3055ea6b93742a4280cdbdb8ec4b5e0ab97ea4ffc79e77855f4f28
-  data.tar.gz: ce48c6512000a972e2f3209b4b142d6ef4cffcec7268720f0a56fed15e75553c
+  metadata.gz: 0b5f4e324f1115eea47583eb6dbc1467394841aadf376f08af4b07e6b0618578
+  data.tar.gz: '08f30541235f4294db3a0546c5de0ee24d46cb0e68d76ecb96f3199175362844'
 SHA512:
-  metadata.gz: a48c2d71823a1756d55ae9343017331f1a6b0579c42f9fcec1c61070062bb51071adfb614b71cd162015943fd368fa179d4f932662d2b8a6e54678ce7e167539
-  data.tar.gz: d95117ea90350c380ee4dcacc1dd2238bac3d67e8338fa973c8231a81f2f701ead6d8f02d306b82789afb396094e250507a915ba974f64509ef480339597c881
+  metadata.gz: 8b47d505b63ae3bca0f033678cb01932d02732e2eecaab9d6c84f88765772daeddbe6380538d85c669cf5565df7378a63ba893e7408de704b8656d2794f77e10
+  data.tar.gz: 357ecae7bc8d57752cb0e66c94d9d3f69645eaf0258340909903759b00deaf8711c0de5aa1e10a17ca6c785dcc2a005f942f3fa40f460b958120823df34f9f4c

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.6"
+  spec.version = "0.1.7"
   spec.authors = ["Magesh Rajan"]
   spec.email   = ["magesh.rajan@zohocorp.com"]
 

data/lib/fluent/plugin/out_site24x7.rb

@@ -157,7 +157,6 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
     
     @s247_tz = {'hrs': 0, 'mins': 0} #UTC
     @log_source = Socket.gethostname
-    @valid_logtype = true
     @log_upload_allowed = true
     @log_upload_stopped_time = 0
     @s247_datetime_format_string = @logtype_config['dateFormat']
@@ -461,7 +460,7 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
   end
 
   def format(tag, time, record)
-    if @valid_logtype && (@log_upload_allowed || (time.to_i - @log_upload_stopped_time > S247_LOG_UPLOAD_CHECK_INTERVAL))
+    if (@log_upload_allowed || (time.to_i - @log_upload_stopped_time > S247_LOG_UPLOAD_CHECK_INTERVAL))
       if (record.size == 1)
         if record.has_key?'message'
           [record['message']].to_msgpack
@@ -585,15 +584,14 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
                 @log_upload_allowed = false
 		            @log_upload_stopped_time =Time.now.to_i
               elsif resp_headers.has_key?'api_upload_enabled' and resp_headers['api_upload_enabled'] == 'False'
-                log.error "[#{current_chunk_id}]:API upload not enabled for log type : "
-                @log_upload_allowed = false
-		            @log_upload_stopped_time =Time.now.to_i
+                log.error "[#{current_chunk_id}]:API upload not enabled for log type"
+                Fluent::Engine.stop
               elsif resp_headers.has_key?'invalid_logtype' and resp_headers['invalid_logtype'] == 'True'
                 log.error "[#{current_chunk_id}]:Log type not present in this account so stopping log collection"
-		            @valid_logtype = false
+                Fluent::Engine.stop
               elsif resp_headers.has_key?'invalid_account' and resp_headers['invalid_account'] == 'True'
                 log.error "[#{current_chunk_id}]: Invalid account so stopping log collection"
-		            @valid_logtype = false
+                Fluent::Engine.stop
               else
                 log.error "[#{current_chunk_id}]: Upload failed for reason : #{response.message}"
               end
@@ -780,4 +778,4 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-site24x7
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Magesh Rajan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Site24x7 output plugin for Fluent event collector.