logstash-output-qingstor 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37cd55d01157b2c5608f05cdbcb180bf4481f211
-  data.tar.gz: b2a6a86bde35c314a081d2fbe5c2e7659441727c
+  metadata.gz: a2ac88521a301ed4c893e420a8d445a66abd4df8
+  data.tar.gz: cd922893c84aedfee1654f4e689bf3402f0fa034
 SHA512:
-  metadata.gz: 808e7a27ec343e15a36733cfa59c77377f19e1948f126b5299f492fdcdc0715cba6d7050529868d5d8349c2a7991a73e95a9f4826107c50c8fa43857de02d5a6
-  data.tar.gz: 3b7c31af1054c5c267d9e1eb4a555eb342e84d0cc3eb6cc42265a6c17f71167dc63522e5e69a9cebac0d1f9e2fd85a884aacee678ba2c9336804c641b4dd79ab
+  metadata.gz: c20dfb1dcc93ec3342bcdc1664638bcdd4abf4f73e343f33333eedf12a510d52b7062ad527cd002d508d9c83eaea1d21ee8d51be19fc3f5debacfd0258153874
+  data.tar.gz: 9dba748ec32b6d7567f253a1d945df6d9262ddb961b939cbc41dcd45a6aced67f9893fcf77a4467cebf7efa11afecbc1f6fd9018f294a4ae7355c6f4f734873f

data/lib/logstash/outputs/qingstor/rotation_policy.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+module LogStash 
+  module Outputs 
+    class Qingstor
+      class RotationPolicy
+        
+        def initialize(policy, file_size, file_time)
+          @policy = policy
+          case policy
+          when "time"
+            init_time(file_time)
+          when "size"
+            init_size(file_size)
+          when "size_and_time"
+            init_size(file_size)
+            init_time(file_time)     
+          end 
+        end 
+
+        def init_size(file_size)
+          if file_size <= 0
+            raise LogStash::ConfigurationError, "'file_size' need to be greater than 0" 
+          end
+          @file_size = file_size
+        end 
+
+        def init_time(file_time)
+          if file_time <= 0
+            raise LogStash::ConfigurationError, "'file_time' need to be greater than 0" 
+          end 
+          @file_time = file_time
+        end 
+
+        def rotate?(file)
+          case @policy
+          when "time"
+            time_rotate?(file)
+          when "size"
+            size_rotate?(file)
+          when "size_and_time"
+            size_and_time_rotate?(file)
+          end
+        end 
+
+        def size_and_time_rotate?(file)
+          size_rotate?(file) || time_rotate?(file)
+        end 
+
+        def size_rotate?(file)
+          file.size >= @file_size
+        end 
+
+        def time_rotate?(file)
+          file.size > 0 && (Time.now - file.ctime) >= @file_time
+        end 
+
+        def needs_periodic?
+          case @policy
+          when "time" then
+            true
+          when "size_and_time" then
+            true
+          else
+            false
+          end
+        end
+
+      end 
+    end 
+  end 
+end 

data/lib/logstash/outputs/qingstor.rb

@@ -10,9 +10,7 @@ class LogStash::Outputs::Qingstor < LogStash::Outputs::Base
   require "logstash/outputs/qingstor/temporary_file"
   require "logstash/outputs/qingstor/temporary_file_factory"
   require "logstash/outputs/qingstor/file_repository"
-  require "logstash/outputs/qingstor/size_rotation_policy"
-  require "logstash/outputs/qingstor/time_rotation_policy"
-  require "logstash/outputs/qingstor/size_and_time_rotation_policy"
+  require "logstash/outputs/qingstor/rotation_policy"
   require "logstash/outputs/qingstor/uploader"
   require "logstash/outputs/qingstor/qingstor_validator"
 
@@ -101,7 +99,7 @@ class LogStash::Outputs::Qingstor < LogStash::Outputs::Base
     
     @file_repository = FileRepository.new(@tags, @encoding, @tmpdir)
 
-    @rotation = rotation_strategy
+    @rotation = RotationPolicy.new(@rotation_strategy, @file_size, @file_time)
 
     executor = Concurrent::ThreadPoolExecutor.new({ 
       :min_threads => 1,
@@ -141,16 +139,6 @@ class LogStash::Outputs::Qingstor < LogStash::Outputs::Base
     rotate_if_needed(prefix_written_to)
   end  # def multi_receive_encoded
   
-  def rotation_strategy 
-    case @rotation_strategy
-    when "size"
-      SizeRotationPolicy.new(@file_size)
-    when "time"
-      TimeRotationPolicy.new(@file_time)
-    when "size_and_time"
-      SizeAndTimeRotationPolicy.new(@file_size, @file_time)
-    end 
-  end 
 
   def rotate_if_needed(prefixs)
     prefixs.each do |prefix|

data/logstash-output-qingstor.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-qingstor'
-  s.version       = '0.1.1'
+  s.version       = '0.1.2'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = 'logstash output plugin for qingstor'
-  s.description   = 'Collect the outcomes of logstash into Qingstor'
+  s.description   = 'Collect the outputs of logstash and store into Qingstor'
   s.homepage      = 'https://github.com/tacinight/logstash-output-qingstor'
   s.authors       = ['Evan Zhao']
   s.email         = 'tacingiht@gmail.com'

data/spec/outputs/qingstor/rotation_policy_spec.rb

@@ -0,0 +1,81 @@
+# encoding: utf-8
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/outputs/qingstor/temporary_file"
+require "logstash/outputs/qingstor/rotation_policy"
+
+describe LogStash::Outputs::Qingstor::RotationPolicy do
+  let(:size_file) { 1024 * 2 }
+  let(:time_file) { 2 }
+  let(:name) { "foobar" }
+  let(:tmp_file) { Stud::Temporary.file }
+  let(:tmp_dir) { tmp_file.path }
+  let(:file) { LogStash::Outputs::Qingstor::TemporaryFile.new(name, tmp_file, tmp_dir) }
+  let(:content) { "May the code be with you" * 100 }
+  
+
+  context "when size_and_time policy" do 
+    subject { described_class.new("size_and_time", size_file, time_file) }
+
+    it "raise error if time_file is no grater then 0" do 
+      expect{ described_class.new("size_and_time", 0, 0) }.to raise_error(LogStash::ConfigurationError)
+      expect{ described_class.new("size_and_time", -1, 0) }.to raise_error(LogStash::ConfigurationError)
+      expect{ described_class.new("size_and_time", 0, -1) }.to raise_error(LogStash::ConfigurationError)
+      expect{ described_class.new("size_and_time", -1, -1) }.to raise_error(LogStash::ConfigurationError)
+    
+    end 
+
+    it "return false if the file is not old enough" do 
+      expect(subject.rotate?(file)).to be_falsey
+    end
+
+    it "return false if the file is old enough with file size 0" do
+      allow(file).to receive(:ctime).and_return(Time.now - (time_file * 2 * 60))
+      expect(subject.rotate?(file)).to be_falsey
+    end
+
+    it "return truth if the file is old enough and non-empty" do 
+      file.write(content)
+      file.fsync
+      allow(file).to receive(:ctime).and_return(Time.now - (time_file * 2 * 60))
+      expect(subject.rotate?(file)).to be_truthy
+    end
+  end 
+
+  context "when size policy" do 
+    subject { described_class.new("size", size_file, time_file) }
+    it "raise error if size_file is no grater then 0" do 
+      expect{described_class.new("size", 0, 0)}.to raise_error(LogStash::ConfigurationError)
+      expect{described_class.new("size", -1, 0)}.to raise_error(LogStash::ConfigurationError)
+    end 
+
+    it "return true if the file has a bigger size value then 'size_file'" do 
+      file.write(content)
+      file.fsync
+      expect(subject.rotate?(file)).to be_truthy
+    end
+  end 
+
+  context "when time policy" do 
+    subject { described_class.new("time", size_file, time_file) }
+    it "raise error if time_file is no grater then 0" do 
+      expect{described_class.new("time", 0, 0)}.to raise_error(LogStash::ConfigurationError)
+      expect{described_class.new("time", 0, -1)}.to raise_error(LogStash::ConfigurationError)
+    end 
+
+    it "return false if the file is not old enough" do 
+      expect(subject.rotate?(file)).to be_falsey
+    end
+
+    it "return false if the file is old enough with file size 0" do
+      allow(file).to receive(:ctime).and_return(Time.now - (time_file * 2 * 60))
+      expect(subject.rotate?(file)).to be_falsey
+    end
+
+    it "return truth if the file is old enough and non-empty" do 
+      file.write(content)
+      file.fsync
+      allow(file).to receive(:ctime).and_return(Time.now - (time_file * 2 * 60))
+      expect(subject.rotate?(file)).to be_truthy
+    end
+  end 
+end 

data/spec/outputs/qingstor/uploader_spec.rb

@@ -38,7 +38,7 @@ describe LogStash::Outputs::Qingstor::Uploader do
 
   it "upload file to the qingstor bucket" do 
     subject.upload(file)
-    expect(list_remote_file.size).to eq(3)
+    expect(list_remote_file.size).to eq(1)
   end 
 
   it "execute a callback when the upload is complete" do 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-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-04-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Collect the outcomes of logstash into Qingstor
+description: Collect the outputs of logstash and store into Qingstor
 email: tacingiht@gmail.com
 executables: []
 extensions: []
@@ -111,7 +111,7 @@ files:
 - lib/logstash/outputs/qingstor.rb
 - lib/logstash/outputs/qingstor/file_repository.rb
 - lib/logstash/outputs/qingstor/qingstor_validator.rb
-- lib/logstash/outputs/qingstor/size_and_time_rotation_policy.rb
+- lib/logstash/outputs/qingstor/rotation_policy.rb
 - lib/logstash/outputs/qingstor/size_rotation_policy.rb
 - lib/logstash/outputs/qingstor/temporary_file.rb
 - lib/logstash/outputs/qingstor/temporary_file_factory.rb
@@ -120,11 +120,9 @@ files:
 - logstash-output-qingstor.gemspec
 - spec/outputs/qingstor/file_repository_spec.rb
 - spec/outputs/qingstor/qingstor_validator_spec.rb
-- spec/outputs/qingstor/size_and_time_rotation_policy_spec.rb
-- spec/outputs/qingstor/size_rotation_policy_spec.rb
+- spec/outputs/qingstor/rotation_policy_spec.rb
 - spec/outputs/qingstor/temporary_file_factory_spec.rb
 - spec/outputs/qingstor/temporary_file_spec.rb
-- spec/outputs/qingstor/time_rotation_policy_spec.rb
 - spec/outputs/qingstor/uploader_spec.rb
 - spec/outputs/qingstor_spec.rb
 - spec/outputs/qs_access_helper.rb
@@ -158,11 +156,9 @@ summary: logstash output plugin for qingstor
 test_files:
 - spec/outputs/qingstor/file_repository_spec.rb
 - spec/outputs/qingstor/qingstor_validator_spec.rb
-- spec/outputs/qingstor/size_and_time_rotation_policy_spec.rb
-- spec/outputs/qingstor/size_rotation_policy_spec.rb
+- spec/outputs/qingstor/rotation_policy_spec.rb
 - spec/outputs/qingstor/temporary_file_factory_spec.rb
 - spec/outputs/qingstor/temporary_file_spec.rb
-- spec/outputs/qingstor/time_rotation_policy_spec.rb
 - spec/outputs/qingstor/uploader_spec.rb
 - spec/outputs/qingstor_spec.rb
 - spec/outputs/qs_access_helper.rb

data/lib/logstash/outputs/qingstor/size_and_time_rotation_policy.rb

@@ -1,24 +0,0 @@
-# encoding: utf-8
-require "logstash/outputs/qingstor/size_rotation_policy"
-require "logstash/outputs/qingstor/time_rotation_policy"
-
-module LogStash 
-  module Outputs 
-    class Qingstor
-      class SizeAndTimeRotationPolicy
-        def initialize(size_file, time_file)
-          @size_strategy = SizeRotationPolicy.new(size_file)
-          @time_strategy = TimeRotationPolicy.new(time_file)
-        end 
-
-        def rotate?(file)
-          @size_strategy.rotate?(file) || @time_strategy.rotate?(file)
-        end 
-
-        def needs_periodic?
-          true
-        end 
-      end 
-    end 
-  end 
-end 

data/spec/outputs/qingstor/size_and_time_rotation_policy_spec.rb

@@ -1,39 +0,0 @@
-# encoding: utf-8
-require "logstash/devutils/rspec/spec_helper"
-require "logstash/outputs/qingstor/temporary_file"
-require "logstash/outputs/qingstor/size_and_time_rotation_policy"
-
-describe LogStash::Outputs::Qingstor::SizeAndTimeRotationPolicy do
-  let(:size_file) { 1024 * 2 }
-  let(:time_file) { 2 }
-  let(:name) { "foobar" }
-  let(:tmp_file) { Stud::Temporary.file }
-  let(:tmp_dir) { tmp_file.path }
-  let(:file) { LogStash::Outputs::Qingstor::TemporaryFile.new(name, tmp_file, tmp_dir) }
-  let(:content) { "May the code be with you" * 100 }
-  subject { described_class.new(size_file, time_file) }
-
-  it "raise error if time_file is no grater then 0" do 
-    expect{ described_class.new(0, 0) }.to raise_error(LogStash::ConfigurationError)
-    expect{ described_class.new(-1, 0) }.to raise_error(LogStash::ConfigurationError)
-    expect{ described_class.new(0, -1) }.to raise_error(LogStash::ConfigurationError)
-    expect{ described_class.new(-1, -1) }.to raise_error(LogStash::ConfigurationError)
-  
-  end 
-
-  it "return false if the file is not old enough" do 
-    expect(subject.rotate?(file)).to be_falsey
-  end
-
-  it "return false if the file is old enough with file size 0" do
-    allow(file).to receive(:ctime).and_return(Time.now - (time_file * 2 * 60))
-    expect(subject.rotate?(file)).to be_falsey
-  end
-
-  it "return truth if the file is old enough and non-empty" do 
-    file.write(content)
-    file.fsync
-    allow(file).to receive(:ctime).and_return(Time.now - (time_file * 2 * 60))
-    expect(subject.rotate?(file)).to be_truthy
-  end
-end 

data/spec/outputs/qingstor/size_rotation_policy_spec.rb

@@ -1,25 +0,0 @@
-# encoding: utf-8
-require "logstash/devutils/rspec/spec_helper"
-require "logstash/outputs/qingstor/temporary_file"
-require "logstash/outputs/qingstor/size_rotation_policy"
-
-describe LogStash::Outputs::Qingstor::SizeRotationPolicy do
-  let(:size_file) { 1024 * 2 }
-  let(:name) { "foobar" }
-  let(:tmp_file) { Stud::Temporary.file }
-  let(:tmp_dir) { tmp_file.path }
-  let(:file) { LogStash::Outputs::Qingstor::TemporaryFile.new(name, tmp_file, tmp_dir) }
-  let(:content) { "May the code be with you" * 100 }
-  subject { described_class.new(size_file) }
-
-  it "raise error if size_file is no grater then 0" do 
-    expect{described_class.new(0)}.to raise_error(LogStash::ConfigurationError)
-    expect{described_class.new(-1)}.to raise_error(LogStash::ConfigurationError)
-  end 
-
-  it "return true if the file has a bigger size value then 'size_file'" do 
-    file.write(content)
-    file.fsync
-    expect(subject.rotate?(file)).to be_truthy
-  end
-end 

data/spec/outputs/qingstor/time_rotation_policy_spec.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-require "logstash/devutils/rspec/spec_helper"
-require "logstash/outputs/qingstor/temporary_file"
-require "logstash/outputs/qingstor/time_rotation_policy"
-
-describe LogStash::Outputs::Qingstor::TimeRotationPolicy do
-  let(:time_file) { 2 }
-  let(:name) { "foobar" }
-  let(:tmp_file) { Stud::Temporary.file }
-  let(:tmp_dir) { tmp_file.path }
-  let(:file) { LogStash::Outputs::Qingstor::TemporaryFile.new(name, tmp_file, tmp_dir) }
-  let(:content) { "May the code be with you" * 100 }
-  subject { described_class.new(time_file) }
-
-  it "raise error if time_file is no grater then 0" do 
-    expect{described_class.new(0)}.to raise_error(LogStash::ConfigurationError)
-    expect{described_class.new(-1)}.to raise_error(LogStash::ConfigurationError)
-  end 
-
-  it "return false if the file is not old enough" do 
-    expect(subject.rotate?(file)).to be_falsey
-  end
-
-  it "return false if the file is old enough with file size 0" do
-    allow(file).to receive(:ctime).and_return(Time.now - (time_file * 2 * 60))
-    expect(subject.rotate?(file)).to be_falsey
-  end
-
-  it "return truth if the file is old enough and non-empty" do 
-    file.write(content)
-    file.fsync
-    allow(file).to receive(:ctime).and_return(Time.now - (time_file * 2 * 60))
-    expect(subject.rotate?(file)).to be_truthy
-  end
-end