logstash-input-sls 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9d5043bd9ad3a1cc123d446408dda36912b2dddd57b385c1c759923d66ee60ef
-  data.tar.gz: d721fa819bda7140a27c5ca9971058060591d7f497b6319b274500b7796377d2
+SHA1:
+  metadata.gz: 5255ea4984de6c4f319118c6fd6921e368313fe4
+  data.tar.gz: b0e0b954d7cf5083dee55bcc823b1622cb00a602
 SHA512:
-  metadata.gz: ea69bedf30527c0bc0e7eb39fe9fd6539759429564563ae4eb645c81f046644371d244356c2ef3ac93aca476a0462cb09a8d12f3a34e7aea2c31a70bfa2aff6e
-  data.tar.gz: 5be4fdf65df4f3bc48a0b2216f57a1d6a046e33819c0127a2e4695192b2bd36a855e0a881a679eec4e9f1880a5f00e25ce078ec052f1b91ae56b8b02ee4708ff
+  metadata.gz: 68c39cf25d2859b63c9dc7338b46b0c485dc16d5bcd5809e6c7cf07fd3593f2391427e4a323b043fff43db97b9c08b31709e7945c18acd5d38bb04aa556af9ca
+  data.tar.gz: 7350d433fc03ac0c175f786baa670f5de1c2627facb95647d0afde015ccf80e4d7d399b6b73c22c07f2596c86bb416a6806a6ef855b0aa9c07316fd196f447ac

data/README.md

@@ -50,7 +50,7 @@ This plugin supports the following configuration options
 
 ## Install the plugin
 
-[logstash-input-sls-0.0.1.gem](https://github.com/aliyun/logstash-input-logservice/raw/master/logstash-input-sls-0.0.1.gem)
+[logstash-input-sls-0.0.2.gem](https://github.com/aliyun/logstash-input-logservice/raw/master/logstash-input-sls-0.0.2.gem)
 
 you can build the gem and install it using:
 
@@ -63,7 +63,7 @@ gem build logstash-input-sls.gemspec
 - Install the plugin from the Logstash home
 
 ```sh
-logstash-plugin install --local logstash-input-sls-0.0.1.gem
+logstash-plugin install --local logstash-input-sls-0.0.2.gem
 ```
 
 - Start Logstash

data/README_CN.md

@@ -65,7 +65,7 @@ output {
 
 * 注意：如果没有修改源码可直接安装
 
-下载地址：[logstash-input-sls-0.0.1.gem](https://github.com/aliyun/logstash-input-logservice/raw/master/logstash-input-sls-0.0.1.gem)
+下载地址：[logstash-input-sls-0.0.2.gem](https://github.com/aliyun/logstash-input-logservice/raw/master/logstash-input-sls-0.0.2.gem)
 
 - 构建 插件
 
@@ -76,7 +76,7 @@ gem build logstash-input-sls.gemspec
 - 安装 日志服务 input 插件
 
 ```sh
-logstash-plugin install --local logstash-input-sls-0.0.1.gem
+logstash-plugin install --local logstash-input-sls-0.0.2.gem
 ```
 
 - 启动 Logstash

data/lib/logstash/inputs/logservice.rb

@@ -3,6 +3,8 @@ require "logstash/namespace"
 require "logstash/event"
 require "logstash/environment"
 require "logstash/inputs/base"
+require 'json'
+require "stud/interval"
 
 root_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 LogStash::Environment.load_runtime_jars! File.join(root_dir, "vendor")
@@ -16,14 +18,7 @@ class LogStash::Inputs::LogService < LogStash::Inputs::Base
     super(*args)
   end
 
-  class LogHubProcessor < LogstashLogHubProcessor
-    attr_accessor :queue
-    def showContent(logmap)
-        event = LogStash::Event.new(logmap)
-        # this will block if output_queue is full. output_queue size is 20
-        @queue << event
-    end
-  end
+  default :codec, "json"
 
   config_name "logservice"
 
@@ -38,6 +33,8 @@ class LogStash::Inputs::LogService < LogStash::Inputs::Base
   config :checkpoint_second, :validate => :number, :default => 30
   config :include_meta, :validate => :boolean, :default => true
   config :consumer_name_with_ip, :validate => :boolean, :default => true
+  config :queue_size, :validate => :number, :default => 1000
+  Processor = com.aliyun.log.logstash
   public
   def register
     @logger.info("Init logstash-input-logservice", :endpoint => @endpoint, :project => @project, :logstore => @logstore,
@@ -51,16 +48,37 @@ class LogStash::Inputs::LogService < LogStash::Inputs::Base
     if @consumer_name_with_ip
         @ip_suffix = '_' + @local_address
     end
+    @process_pid = "_#{Process.pid}"
     @logger.info("Running logstash-input-logservice",:local_address => @local_address)
-    @handler = LogHubProcessor.new()
-    @handler.setCheckpointSecond(@checkpoint_second)
-    @handler.setIncludeMeta(@include_meta)
-    @handler.queue = queue
-    LogHubStarter.startWorker(@handler, @endpoint, @access_id, @access_key, @project, @logstore, @consumer_group, @consumer_name + @ip_suffix, @position)
+    LogHubStarter.startWorker(@endpoint, @access_id, @access_key, @project, @logstore, @consumer_group, @consumer_name + @ip_suffix + @process_pid, @position, @checkpoint_second, @include_meta, @queue_size)
+   
+    consume(queue)
     rescue Exception => e
         @logger.error("Start 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, :exception => e)
+
+  end
+  
+  def consume(queue)
+         while !stop?
+             while !Processor.LogstashLogHubProcessor.queueCache.isEmpty
+                 textmap = Processor.LogstashLogHubProcessor.queueCache.poll
+                 event = LogStash::Event.new(textmap)
+                 decorate(event)
+                 queue << event
+             end
+          Stud.stoppable_sleep(@checkpoint_second) { stop? }
+        end # loop
+
+  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
   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.2'
+  s.version         = '0.0.4'
   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,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-sls
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - lichao
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,9 +20,8 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,42 +31,42 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.22
-  name: stud
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.22
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,7 +93,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +108,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.2.3
+signing_key: 
 specification_version: 4
 summary: This sls input streams a string at a definable interval.
 test_files: []