logstash-output-qingstor 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff8942eb9e9d52efdd58c06bfdeb77abc8698d2c
-  data.tar.gz: 34704f434b5c411eb7ab5bd3cbf4a553b9e41176
+  metadata.gz: 37cd55d01157b2c5608f05cdbcb180bf4481f211
+  data.tar.gz: b2a6a86bde35c314a081d2fbe5c2e7659441727c
 SHA512:
-  metadata.gz: 80a48c0492352fe8d1b486eccb9e4dc3848bb3aafefc8cc0229a0db3ffb63f7346cce08e8dc4efad7fcfa09f9c3a78681f2d0b81d8e705afc8d1f902068ede28
-  data.tar.gz: cc45d155ba152691d7972e4895f838ea4f3486fccf59bea0dd60480bbb1c6d154b2d5d3a84b356a741c1632d8fb02553c338fa7dd5e38c5966cf2888a7508b3e
+  metadata.gz: 808e7a27ec343e15a36733cfa59c77377f19e1948f126b5299f492fdcdc0715cba6d7050529868d5d8349c2a7991a73e95a9f4826107c50c8fa43857de02d5a6
+  data.tar.gz: 3b7c31af1054c5c267d9e1eb4a555eb342e84d0cc3eb6cc42265a6c17f71167dc63522e5e69a9cebac0d1f9e2fd85a884aacee678ba2c9336804c641b4dd79ab

data/lib/logstash/outputs/qingstor.rb

@@ -41,6 +41,12 @@ class LogStash::Outputs::Qingstor < LogStash::Outputs::Base
   # The key to access your QingStor
   config :secret_access_key, :validate => :string, :required => true
 
+  # If specified, it would redirect to this host address.
+  config :host, :validate => :string, :default => nil
+
+  # It specifies the host port, please coordinate with config 'host'.
+  config :port, :validate => :number, :default => 443
+
   # The name of the qingstor bucket
   config :bucket, :validate => :string, :required => true
 
@@ -65,10 +71,10 @@ class LogStash::Outputs::Qingstor < LogStash::Outputs::Base
   config :rotation_strategy, :validate => ["size_and_time", "size", "time"], :default => "size_and_time"
 
   # Define the size requirement for each file to upload to qingstor. In byte.
-  config :size_file, :validate => :number, :default => 1024 * 1024 * 5
+  config :file_size, :validate => :number, :default => 1024 * 1024 * 5
 
   # Define the time interval for each file to upload to qingstor. In minutes.
-  config :time_file, :validate => :number, :default => 15 
+  config :file_time, :validate => :number, :default => 15 
 
   # Specify maximum number of workers to use to upload the files to Qingstor
   config :upload_workers_count, :validate => :number, :default => (Concurrent.processor_count * 0.5).ceil
@@ -138,11 +144,11 @@ class LogStash::Outputs::Qingstor < LogStash::Outputs::Base
   def rotation_strategy 
     case @rotation_strategy
     when "size"
-      SizeRotationPolicy.new(@size_file)
+      SizeRotationPolicy.new(@file_size)
     when "time"
-      TimeRotationPolicy.new(@time_file)
+      TimeRotationPolicy.new(@file_time)
     when "size_and_time"
-      SizeAndTimeRotationPolicy.new(@size_file, @time_file)
+      SizeAndTimeRotationPolicy.new(@file_size, @file_time)
     end 
   end 
 
@@ -173,6 +179,7 @@ class LogStash::Outputs::Qingstor < LogStash::Outputs::Base
 
   def get_bucket
     @qs_config = QingStor::SDK::Config.init @access_key_id, @secret_access_key
+    @qs_config.update({ host: @host, port: @port }) unless @host.nil?
     @qs_service = QingStor::SDK::Service.new @qs_config
     @qs_service.bucket @bucket, @region
   end 

data/logstash-output-qingstor.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-qingstor'
-  s.version       = '0.1.0'
+  s.version       = '0.1.1'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = 'logstash output plugin for qingstor'
-  s.description   = 'Put the outcomes of logstash into qingstor'
+  s.description   = 'Collect the outcomes of logstash into Qingstor'
   s.homepage      = 'https://github.com/tacinight/logstash-output-qingstor'
   s.authors       = ['Evan Zhao']
   s.email         = 'tacingiht@gmail.com'
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency "logstash-codec-plain"
-  s.add_runtime_dependency "qingstor-sdk", "=1.9.2"
+  s.add_runtime_dependency "qingstor-sdk", ">=1.9.2"
   s.add_runtime_dependency "concurrent-ruby"
   
   s.add_development_dependency "stud", "~> 0.0.22"

data/spec/outputs/qingstor_spec.rb

@@ -47,4 +47,14 @@ describe LogStash::Outputs::Qingstor do
     expect(list_remote_file.size).to eq(2)
   end 
 
+  it "redirect to the specified host without specified port" do 
+      new_options = options.merge({"host" => "qingstor.dev", "port" => 444})
+      expect{fetch_event(new_options, events_and_encoded)}.to raise_error(Net::HTTP::Persistent::Error)
+    end 
+
+  it "redirect to the specified host without specified port" do 
+    new_options = options.merge({"host" => "qingstor.dev", "port" => 444})
+    expect{fetch_event(new_options, events_and_encoded)}.to raise_error(Net::HTTP::Persistent::Error)
+  end 
+  
 end 

data/spec/outputs/spec_helper.rb

@@ -1,4 +1,4 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/logging/logger"
 
-LogStash::Logging::Logger::configure_logging("debug")
+LogStash::Logging::Logger::configure_logging("warn")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-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-09 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +41,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.2
   name: qingstor-sdk
@@ -49,7 +49,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.2
 - !ruby/object:Gem::Dependency
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Put the outcomes of logstash into qingstor
+description: Collect the outcomes of logstash into Qingstor
 email: tacingiht@gmail.com
 executables: []
 extensions: []