logstash-input-qingstor 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 679252ef4ae7fcdd727e8f166144a8bace84a129
-  data.tar.gz: 0cbb0d8e979c3de16c54b4ca36a2b60421101c13
+  metadata.gz: c156065e6f20cd2f8e096288335596f2c6ab31cf
+  data.tar.gz: 843ab1800defe7b983f19aec17991e5d1aa90494
 SHA512:
-  metadata.gz: 83373625a41b3b4096c3fadcf416ab3eeec8e31229ed2283cc1f6fe12edabb3be282cc28260369fb7e4a62406017547353e8f7cfe194d9e8d2a469dc3b1e845c
-  data.tar.gz: 865337483a3d9b17a699ef7cf1cf36f530fa00d82cdebdf843b74aaf5dd34916ff386a22c2b7c423349c7ba8b325aea7362f6ae9e629c9468b5c7ad6e9d98c06
+  metadata.gz: 3470074fc6bd016a3ee83eb1de998823f4c3912305c18a9065793f03e4b5134e9580a2ce95f05d39fe8c316078463a5bb1bcceabcad868478c8aecd5a59b97a0
+  data.tar.gz: 74b562849a1f53e8322360ef22f74147226dd0da64512c37f049cf84c04f859d5640c43a2d270b2cf486760ac4ed44921b569cf16d5ddecc7a56eac5101a049f

data/lib/logstash/inputs/qingstor.rb

@@ -36,7 +36,7 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
   
   # If this set to true, the file will backup to a local dir,
   # please make sure you can access to this dir.
-  config :local_dir, :validate => :string, :default => File.expand_path("~/")
+  config :backup_local_dir, :validate => :string, :default => File.expand_path("~/")
 
   # If specified, the file will be upload to this bucket of the given region
   config :backup_bucket, :validate => :string, :default => nil
@@ -44,8 +44,8 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
   # Specified the backup region in Qingstor.
   config :backup_region, :validate => ["pek3a", "sh1a"], :default => "pek3a"
 
-  # This prefix will add before backup filename.
-  config :backup_prefix, :validate => :string, :default => nil
+  # This prefix, specially in qingstor, will add before the backup filename
+  config :backup_prefix, :validate => :string, :default => ""
   
   # Use sincedb to record the last download time 
   config :sincedb_path, :validate => :string, :default => nil 
@@ -61,8 +61,8 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
       raise LogStash::ConfigurationError, "Logstash must have the permissions to write to the temporary directory: #{@tmpdir}"
     end
 
-    if !@local_dir.nil? && !directory_valid?(@local_dir)
-      raise LogStash::ConfigurationError, "Logstash must have the permissions to write to the temporary directory: #{@local_dir}"
+    if !@backup_local_dir.nil? && !directory_valid?(@backup_local_dir)
+      raise LogStash::ConfigurationError, "Logstash must have the permissions to write to the temporary directory: #{@backup_local_dir}"
     end
 
 
@@ -95,7 +95,7 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
     objects.each do |key, time|
       process_log(queue, key)
       backup_to_bucket key unless @backup_bucket.nil?
-      backup_to_local_dir unless @local_dir.nil?
+      backup_to_local_dir unless @backup_local_dir.nil?
       @qs_bucket.delete_object key if @delete_remote_files
     end
 
@@ -143,10 +143,10 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
     
     md5_string = Digest::MD5.file(@tmp_file_path).to_s
 
-    new_key = if backup_prefix.end_with?('/')
-                backup_prefix + key 
+    new_key = if @backup_prefix.end_with?('/')
+                @backup_prefix + key 
               else 
-                backup_prefix + '/' + key 
+                @backup_prefix + '/' + key 
               end 
 
     bucket.put_object new_key, { 
@@ -156,8 +156,8 @@ class LogStash::Inputs::Qingstor < LogStash::Inputs::Base
   end 
  
   def backup_to_local_dir
-    FileUtils.mkdir_p @local_dir unless File.exist? @local_dir
-    FileUtils.cp @tmp_file_path, @local_dir
+    FileUtils.mkdir_p @backup_local_dir unless File.exist? @backup_local_dir
+    FileUtils.cp @tmp_file_path, @backup_local_dir
   end
  
   def process_local_log(queue, filename)

data/logstash-input-qingstor.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-qingstor'
-  s.version       = '0.1.1'
+  s.version       = '0.1.2'
   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'
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core-plugin-api", ">=1.6", "<=2.99"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'stud', '>= 0.0.22'
-  s.add_runtime_dependency "qingstor-sdk", "=1.9.2"
+  s.add_runtime_dependency "qingstor-sdk", ">=1.9.2"
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/inputs/qingstor_spec.rb

@@ -31,7 +31,7 @@ describe LogStash::Inputs::Qingstor do
 
   context "local backup" do 
     it "backup to local dir" do 
-      fetch_events(config.merge({"local_dir" => local_backup_dir }))
+      fetch_events(config.merge({"backup_local_dir" => local_backup_dir }))
       expect(File.exists?(File.join(local_backup_dir, key1))).to be_truthy
       expect(File.exists?(File.join(local_backup_dir, key2))).to be_truthy
     end 
@@ -53,6 +53,4 @@ describe LogStash::Inputs::Qingstor do
     end 
   end 
 
-  context ""
-  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-qingstor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Evan Zhao
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.2
   name: qingstor-sdk
@@ -69,7 +69,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.2
 - !ruby/object:Gem::Dependency