fluent-plugin-elb-access-log 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96510ed8b34e1025ead147d989eefc4459404ae8
-  data.tar.gz: f44e0a4c33aa20267fa604fe181f1861c24b1ed5
+  metadata.gz: 08f77efb6afe4e6a4ff1e3c2d9fb956eb4cbb5a5
+  data.tar.gz: 5f4249955cf58fc6c77c7281a1911014e7572940
 SHA512:
-  metadata.gz: a0375b94759d747d2f3bbdf0cec1b048cb1ec81149f1db9f111edc66726563b4cb75316ecb45a3c87b248ae8215076f0b32b00457779aacb3c04e6b635d2d495
-  data.tar.gz: 573db4ec038fb669d091e4125a7f09d0c485d619f28db67aea3e120f2439d9d9386d1f065790ebd085bd0f1e90c286fde90b224c95f56182474abc5ed8453a4f
+  metadata.gz: c5216d607dce35496ecc0a1ee43472d38932b70b8dacf4b2d1e0d7284e6eaac3297948edb87f4660fc75570e1650b84d0a49eeabecf37c94743fe3dfcda4faaf
+  data.tar.gz: 7936a97c6014943af80f42ecb952672012957d5d8a4de93327e0d2ebaa4d98821cb01b1ed82d0d12edc5f66996e699bd89f58bd9fc3c28054ed3dbf4eb99180b

data/README.md

@@ -39,6 +39,7 @@ Or install it yourself as:
 
   #tag elb.access_log
   #tsfile_path /var/tmp/fluent-plugin-elb-access-log.ts
+  #histfile_path /var/tmp/fluent-plugin-elb-access-log.history
   #interval 300
   #start_datetime 2015/05/24 17:00
   #buffer_sec 600

data/lib/fluent/plugin/in_elb_access_log.rb

@@ -40,6 +40,7 @@ class Fluent::ElbAccessLogInput < Fluent::Input
   config_param :s3_prefix,         :string,  :default => nil
   config_param :tag,               :string,  :default => 'elb.access_log'
   config_param :tsfile_path,       :string,  :default => '/var/tmp/fluent-plugin-elb-access-log.ts'
+  config_param :histfile_path,     :string,  :default => '/var/tmp/fluent-plugin-elb-access-log.history'
   config_param :interval,          :time,    :default => 300
   config_param :start_datetime,    :string,  :default => nil
   config_param :buffer_sec,        :time,    :default => 600
@@ -61,6 +62,7 @@ class Fluent::ElbAccessLogInput < Fluent::Input
     super
 
     FileUtils.touch(@tsfile_path)
+    FileUtils.touch(@histfile_path)
 
     if @start_datetime
       @start_datetime = Time.parse(@start_datetime).utc
@@ -68,7 +70,7 @@ class Fluent::ElbAccessLogInput < Fluent::Input
       @start_datetime = Time.parse(File.read(@tsfile_path)).utc rescue Time.now.utc
     end
 
-    @history = []
+    @history = load_history
   end
 
   def start
@@ -91,6 +93,8 @@ class Fluent::ElbAccessLogInput < Fluent::Input
       if @history.length > @history_length
         @history.shift(@history.length - @history_length)
       end
+
+      save_history
     end
 
     @loop.attach(timer)
@@ -205,6 +209,16 @@ class Fluent::ElbAccessLogInput < Fluent::Input
     end
   end
 
+  def load_history
+    File.read(@histfile_path).split("\n")
+  end
+
+  def save_history
+    open(@histfile_path, 'w') do |histfile|
+      histfile << @history.join("\n")
+    end
+  end
+
   def client
     return @client if @client
 

data/lib/fluent_plugin_elb_access_log/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginElbAccessLog
-  VERSION = '0.1.8'
+  VERSION = '0.2.0'
 end

data/spec/in_elb_access_log_config_spec.rb

@@ -11,6 +11,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
     Timecop.freeze(today)
     allow(FileUtils).to receive(:touch)
     allow(File).to receive(:read) { nil }
+    allow_any_instance_of(Fluent::ElbAccessLogInput).to receive(:load_history) { [] }
   end
 
   context 'when default' do
@@ -34,6 +35,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
       expect(driver.instance.s3_prefix).to be_nil
       expect(driver.instance.tag).to eq 'elb.access_log'
       expect(driver.instance.tsfile_path).to eq '/var/tmp/fluent-plugin-elb-access-log.ts'
+      expect(driver.instance.histfile_path).to eq '/var/tmp/fluent-plugin-elb-access-log.history'
       expect(driver.instance.interval).to eq 300
       expect(driver.instance.start_datetime).to eq today
       expect(driver.instance.buffer_sec).to eq 600
@@ -52,6 +54,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
     let(:s3_prefix) { 's3-prefix' }
     let(:tag) { 'any.tag' }
     let(:tsfile_path) { '/tmp/foo' }
+    let(:histfile_path) { '/tmp/bar' }
     let(:interval) { 500 }
     let(:start_datetime) { today - 3600 }
     let(:buffer_sec) { 1200 }
@@ -71,6 +74,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
         s3_prefix: s3_prefix,
         tag: tag,
         tsfile_path: tsfile_path,
+        histfile_path: histfile_path,
         interval: interval,
         start_datetime: start_datetime,
         buffer_sec: buffer_sec,
@@ -91,6 +95,7 @@ describe 'Fluent::ElbAccessLogInput#configure' do
       expect(driver.instance.s3_prefix).to eq s3_prefix
       expect(driver.instance.tag).to eq tag
       expect(driver.instance.tsfile_path).to eq tsfile_path
+      expect(driver.instance.histfile_path).to eq histfile_path
       expect(driver.instance.interval).to eq interval
       expect(driver.instance.start_datetime).to eq start_datetime
       expect(driver.instance.buffer_sec).to eq buffer_sec

data/spec/in_elb_access_log_spec.rb

@@ -29,6 +29,7 @@ describe Fluent::ElbAccessLogInput do
   before do
     Timecop.freeze(today)
     allow_any_instance_of(Fluent::ElbAccessLogInput).to receive(:client) { client }
+    allow_any_instance_of(Fluent::ElbAccessLogInput).to receive(:load_history) { [] }
     allow(FileUtils).to receive(:touch)
   end
 
@@ -44,6 +45,7 @@ describe Fluent::ElbAccessLogInput do
       expect(client).to receive(:list_objects).with(bucket: s3_bucket, prefix: today_prefix) { [] }
       expect(client).to receive(:list_objects).with(bucket: s3_bucket, prefix: tomorrow_prefix) { [] }
       expect(driver.instance).to_not receive(:save_timestamp).with(today)
+      expect(driver.instance).to receive(:save_history)
 
       driver.run
     end
@@ -88,6 +90,7 @@ describe Fluent::ElbAccessLogInput do
       end
 
       expect(driver.instance).to receive(:save_timestamp).with(tomorrow)
+      expect(driver.instance).to receive(:save_history)
 
       driver.run
     end
@@ -391,6 +394,7 @@ describe Fluent::ElbAccessLogInput do
       end
 
       expect(driver.instance).to receive(:save_timestamp).with(today)
+      expect(driver.instance).to receive(:save_history)
 
       driver.run
     end
@@ -453,6 +457,7 @@ describe Fluent::ElbAccessLogInput do
       end
 
       expect(driver.instance).to_not receive(:save_timestamp)
+      expect(driver.instance).to receive(:save_history)
 
       driver.run
     end
@@ -512,6 +517,7 @@ describe Fluent::ElbAccessLogInput do
 
       expect(client).to_not receive(:get_object)
       expect(driver.instance).to_not receive(:save_timestamp)
+      expect(driver.instance).to receive(:save_history)
 
       driver.run
     end
@@ -539,6 +545,7 @@ describe Fluent::ElbAccessLogInput do
       history = driver.instance.instance_variable_get(:@history)
       history << today_object_key
       expect(driver.instance).to_not receive(:save_timestamp)
+      expect(driver.instance).to receive(:save_history)
 
       driver.run
     end
@@ -568,6 +575,7 @@ describe Fluent::ElbAccessLogInput do
       end
 
       expect(driver.instance).to receive(:save_timestamp).with(today)
+      expect(driver.instance).to receive(:save_history)
     end
 
     subject { history.length }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elb-access-log
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Genki Sugawara