logstash-input-sls 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11f659cbda6d0cf19706c94ffa519445a5e0f93e7a49675f7e86a2fe8ab08670
-  data.tar.gz: 0bb504cbca999c2de817400edad523dbf96b43d8a3e9dbc9f74e8fc085b3a7c8
+  metadata.gz: c1506f164f61b678ba0b725eaea73835b1d3fbfcd4c7cb6214dc5c1d8330e403
+  data.tar.gz: 317cb1d5c66921f4b118931004e4d14e511ed0b694877baf594b7c5a5dd759e2
 SHA512:
-  metadata.gz: 7025421c2640a066e4683a1db237ce67ea33b1e3776d15bd41cac87d88c2b82a527b9a32224b9202276ea90b98a676685bb89fd9831f54cd678e1f4fe5f5f527
-  data.tar.gz: da9ef324519558152ab15394d9a0299204898508a237bd7060501f2f86d0eaa0b0b84701338247e3bf3fb4adc9e62d5b93d2a1fb0c8e136135dc2dfcebdb7839
+  metadata.gz: 5e5ef91e46893fd8fba30fad9cc917164b77020fecbc6983e7ffd2c6dd66256d8738d435b881bb9162bd967818053fdbbf42f54f10d3767232d7da9f3312939c
+  data.tar.gz: b3814d76424b61261a99b8a1ed9751d4166652f894f55f4ac031cfca3bef1f505f7b9487a25a338c9282a31fb62ed837fe93cdc748c23a80afdd055dd20fd831

data/lib/logstash/inputs/logservice.rb

@@ -13,7 +13,7 @@ java_import 'com.aliyun.log.logstash.LogHubStarter'
 java_import 'com.aliyun.log.logstash.LogstashLogHubProcessor'
 
 class LogStash::Inputs::LogService < LogStash::Inputs::Base
-  attr_accessor :worker
+  # attr_accessor :worker
   def initialize(*args)
     super(*args)
   end
@@ -43,7 +43,7 @@ class LogStash::Inputs::LogService < LogStash::Inputs::Base
 
   config :fetch_interval_millis, :validate => :number, :default => 200
 
-  Processor = com.aliyun.log.logstash
+  # Processor = com.aliyun.log.logstash
   public
   def register
     @logger.info("Init logstash-input-logservice", :endpoint => @endpoint, :project => @project, :logstore => @logstore,
@@ -58,10 +58,14 @@ class LogStash::Inputs::LogService < LogStash::Inputs::Base
         @ip_suffix = '_' + @local_address
     end
     @process_pid = "_#{Process.pid}"
-    @logger.info("Running logstash-input-logservice",:local_address => @local_address)
+    @logger.info("Running logstash-input-logservice", :endpoint => @endpoint, :project => @project,
+    :logstore => @logstore, :consumer_group => @consumer_group, :consumer_name => @consumer_name,
+    :position => @position, :checkpoint_second => @checkpoint_second, :include_meta => @include_meta,
+    :consumer_name_with_ip => @consumer_name_with_ip, :local_address => @local_address)
     @blockingQueue = java.util.concurrent.LinkedBlockingQueue.new(1000)
-    LogHubStarter.startWorker(@endpoint, @access_id, @access_key, @project, @logstore, @consumer_group, @consumer_name + @ip_suffix + @process_pid, @position, @checkpoint_second, @include_meta, @blockingQueue, @proxy_host, @proxy_port, @proxy_username, @proxy_password, @proxy_domain, @proxy_workstation, @fetch_interval_millis)
-   
+    @logHubStarter = LogHubStarter.new()
+    @logHubStarter.startWorker(@endpoint, @access_id, @access_key, @project, @logstore, @consumer_group, @consumer_name + @ip_suffix + @process_pid, @position, @checkpoint_second, @include_meta, @blockingQueue, @proxy_host, @proxy_port, @proxy_username, @proxy_password, @proxy_domain, @proxy_workstation, @fetch_interval_millis)
+
     consume(queue)
 
     rescue Exception => e
@@ -70,7 +74,7 @@ class LogStash::Inputs::LogService < LogStash::Inputs::Base
             :checkpoint_second => @checkpoint_second, :include_meta => @include_meta, :consumer_name_with_ip => @consumer_name_with_ip, :exception => e)
 
   end
-  
+
   def consume(queue)
          while !stop?
              while !@blockingQueue.isEmpty
@@ -86,17 +90,12 @@ class LogStash::Inputs::LogService < LogStash::Inputs::Base
                      retry
                  end
              end
-          Stud.stoppable_sleep(@checkpoint_second) { stop? }
+             sleep(0.01)
         end # loop
 
-  end  
-
+  end
   def stop
-    # nothing to do in this case so it is not necessary to define stop
-    # examples of common "stop" tasks:
-    #  * close sockets (unblocking blocking reads/accepts)
-    #  * cleanup temporary files
-    #  * terminate spawned threads
+    @logHubStarter.stopWorker()
   end
 
   def teardown

data/logstash-input-sls.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-sls'
-  s.version         = '0.0.15'
+  s.version         = '0.0.16'
   s.licenses = ['MIT']
   s.summary = "This sls input streams a string at a definable interval."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-sls
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - lichao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api