logstash-input-qingstor 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a30583b85c2e846709cecde14a016f28f1907b3
-  data.tar.gz: 7834fd79bf3ad2c7de3e971faf42e347fe38f769
+  metadata.gz: 679252ef4ae7fcdd727e8f166144a8bace84a129
+  data.tar.gz: 0cbb0d8e979c3de16c54b4ca36a2b60421101c13
 SHA512:
-  metadata.gz: e63c11974c60a1fa33525c5b758ebbe7d80202d0e534605060bdbc7833df608d87db40e92c4cc4775be37ae78373df264ed6d96b226feab083bee8a658ec35f5
-  data.tar.gz: 0723a8e49fd65c445d5546030f8fc4130794cc96148ebeebd8e517b9280f00f2db732416a90eff7d8dbe3b7d499f2a9e166978bace5b2a624075cb51f4fbad0a
+  metadata.gz: 83373625a41b3b4096c3fadcf416ab3eeec8e31229ed2283cc1f6fe12edabb3be282cc28260369fb7e4a62406017547353e8f7cfe194d9e8d2a469dc3b1e845c
+  data.tar.gz: 865337483a3d9b17a699ef7cf1cf36f530fa00d82cdebdf843b74aaf5dd34916ff386a22c2b7c423349c7ba8b325aea7362f6ae9e629c9468b5c7ad6e9d98c06

data/README.md

@@ -4,7 +4,11 @@
 作为一个input插件, 它能下载存储在Qingstor上的日志文件, 读入到logstash中进行进一步处理.  
 详细功能参考下面配置说明.  
 
-目前代码尚未提交至官方插件库, 需要手动安装, 安装方法参考下文.
+目前插件已经提交至rubygems.org, 使用以下命令安装:
+```sh
+    bin/logstash-plugin install logstash-input-qingstor
+```
+ 手动安装本地代码, 安装方法参考下文.
 
 ## 1. 配置说明
 
@@ -37,7 +41,7 @@ input {
 
         # 是否在处理之后, 删除远程bucket中的文件.
         # 默认: false
-        delete_later => true
+        delete_remote_files => true
 
         # 如果指定一个本地目录, 那么在处理完之后将文件备份至该位置.
         # 默认:　nil 
@@ -108,11 +112,15 @@ bin/logstash-plugin install /your/local/plugin/logstash-input-qingstor.gem
 As an input plugin, it can download the log files from [Qingstor](https://www.qingcloud.com/products/storage#qingstor), and read them into logstash.  
 Qingstor is a remarkable object storage service provided by [Qingcloud](https://www.qingcloud.com/).
 
-For now, We haven't submitted this to official plugin repository. If you want to have a try, please refer to the following guide to install it manually.
+For now, We've submitted this plugin to rubygems.org. Use the following command to install.
+```sh
+    bin/logstash-plugin install logstash-input-qingstor
+```
+If want to install the local code, please refer to the following guide to install it manually.
 
 ## 1. Configuration Guide
 
-#### 1.1 Run in minimal Configuration Items
+#### 1.1 Run in minimal Configuration Settings
 ```sh
 input {
     qingstor {

data/lib/logstash/inputs/qingstor.rb

@@ -32,7 +32,7 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
   config :tmpdir, :validate => :string, :default => File.join(Dir.tmpdir, "qingstor2logstash")
 
   # If this set to true, the remote file will be deleted after processed
-  config :delete_later, :validate => :boolean, :default => false
+  config :delete_remote_files, :validate => :boolean, :default => false
   
   # If this set to true, the file will backup to a local dir,
   # please make sure you can access to this dir.
@@ -73,7 +73,7 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
     @qs_bucket = @qs_service.bucket @bucket, @region
 
     QingstorValidator.bucket_valid?(@qs_bucket)
-    QingstorValidator.prefix_valid?(@backup_prefix)
+    QingstorValidator.prefix_valid?(@backup_prefix) unless @backup_prefix.nil?
 
   end # def register
 
@@ -96,7 +96,7 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
       process_log(queue, key)
       backup_to_bucket key unless @backup_bucket.nil?
       backup_to_local_dir unless @local_dir.nil?
-      @qs_bucket.delete_object key if @delete_later
+      @qs_bucket.delete_object key if @delete_remote_files
     end
 
     # if fetched nothing, just return
@@ -248,7 +248,7 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
 
   public 
   def stop
-   Stud.stop!(@current_thread)
+   Stud.stop!(@current_thread) unless @current_thread.nil?
   end
 
   def directory_valid?(path)

data/lib/logstash/inputs/qingstor/qingstor_validator.rb

@@ -7,7 +7,7 @@ module LogStash
     class Qingstor
       class QingstorValidator
 
-        def bucket_valid?(bucket)
+        def self.bucket_valid?(bucket)
             res = bucket.head
             case res[:status_code] 
             when 401
@@ -18,7 +18,7 @@ module LogStash
             true
         end 
 
-        def prefix_valid?(prefix)
+        def self.prefix_valid?(prefix)
           if prefix.start_with?("/") || prefix.length >= 1024
             raise LogStash::ConfigurationError, "Prefix must not start with '/' with length less than 1024 "
           end 

data/logstash-input-qingstor.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-qingstor'
-  s.version       = '0.1.0'
+  s.version       = '0.1.1'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = 'logstash input plugin for QingStor'
-  s.description   = 'Use this plugin to fetch file as a input of logstash from QingStor'
+  s.description   = 'Use this plugin to fetch file as a input of logstash from Qingstor'
   s.homepage      = 'https://github.com/Tacinight/logstash-input-qingstor'
   s.authors       = ['Evan Zhao']
   s.email         = 'tacingiht@gmail.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-qingstor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Evan Zhao
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Use this plugin to fetch file as a input of logstash from QingStor
+description: Use this plugin to fetch file as a input of logstash from Qingstor
 email: tacingiht@gmail.com
 executables: []
 extensions: []