logstash-input-sls 0.0.13 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a48935e319e2acc14e90f5cd79fb5c18e5728eea36d93dc152c98afe68e73db7
-  data.tar.gz: 6e35b57e54ec0c20fe1240671fc3dadcdd3bdcba36ab27933cf83888b629f6a5
+  metadata.gz: c1506f164f61b678ba0b725eaea73835b1d3fbfcd4c7cb6214dc5c1d8330e403
+  data.tar.gz: 317cb1d5c66921f4b118931004e4d14e511ed0b694877baf594b7c5a5dd759e2
 SHA512:
-  metadata.gz: de009dd65e2ca92f6b17ed7049648dddd4aa00cfe8217ab795910acc52aa0ef78d38e99cb351652937b5c4d5dc939502fe7698cc1c3b25889ef0e22360210dbd
-  data.tar.gz: 9b0de0e5a8ca123165ec1a6a4c3f3b0a3d0169616899b13928cd40dd43d707918080bf88da472742659b3514ca5c9c0fdb91eb307e1b46bfce9a4374826078bb
+  metadata.gz: 5e5ef91e46893fd8fba30fad9cc917164b77020fecbc6983e7ffd2c6dd66256d8738d435b881bb9162bd967818053fdbbf42f54f10d3767232d7da9f3312939c
+  data.tar.gz: b3814d76424b61261a99b8a1ed9751d4166652f894f55f4ac031cfca3bef1f505f7b9487a25a338c9282a31fb62ed837fe93cdc748c23a80afdd055dd20fd831

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://gems.ruby-china.com'
+source 'https://rubygems.org/'
 gemspec

data/lib/logstash/inputs/logservice.rb

@@ -12,8 +12,8 @@ LogStash::Environment.load_runtime_jars! File.join(root_dir, "vendor")
 java_import 'com.aliyun.log.logstash.LogHubStarter'
 java_import 'com.aliyun.log.logstash.LogstashLogHubProcessor'
 
-    class LogStash::Inputs::LogService < LogStash::Inputs::Base
-  attr_accessor :worker
+class LogStash::Inputs::LogService < LogStash::Inputs::Base
+  # attr_accessor :worker
   def initialize(*args)
     super(*args)
   end
@@ -33,7 +33,17 @@ java_import 'com.aliyun.log.logstash.LogstashLogHubProcessor'
   config :checkpoint_second, :validate => :number, :default => 30
   config :include_meta, :validate => :boolean, :default => true
   config :consumer_name_with_ip, :validate => :boolean, :default => true
-  Processor = com.aliyun.log.logstash
+
+  config :proxy_host, :validate => :string, :default => nil
+  config :proxy_port, :validate => :number, :default => 0
+  config :proxy_username, :validate => :string, :default => nil
+  config :proxy_password, :validate => :string, :default => nil
+  config :proxy_domain, :validate => :string, :default => nil
+  config :proxy_workstation, :validate => :string, :default => nil
+
+  config :fetch_interval_millis, :validate => :number, :default => 200
+
+  # Processor = com.aliyun.log.logstash
   public
   def register
     @logger.info("Init logstash-input-logservice", :endpoint => @endpoint, :project => @project, :logstore => @logstore,
@@ -48,10 +58,14 @@ java_import 'com.aliyun.log.logstash.LogstashLogHubProcessor'
         @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)
-   
+    @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
@@ -60,7 +74,7 @@ java_import 'com.aliyun.log.logstash.LogstashLogHubProcessor'
             :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
@@ -76,17 +90,12 @@ java_import 'com.aliyun.log.logstash.LogstashLogHubProcessor'
                      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.13'
+  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.13
+  version: 0.0.16
 platform: ruby
 authors:
 - lichao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api