logstash-input-cloudflare_logs 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45cafa94e6ebef8b8bcf271e1c90ea4787f8e0de
-  data.tar.gz: fb4aee6541e2ec1dc765240e48296e2009dff145
+  metadata.gz: 1a7139959102c50bbe70f6f32d2dcb94efc2e96b
+  data.tar.gz: 587e5c2f61b9292e99ed759bc31b0e59e492a245
 SHA512:
-  metadata.gz: 0aa3b45c5560b8681ce038a68c922ea959eb8c25a8e1bd78d37cfe16e961e2c02a9d070797a7da3b15670145fe20d1f11c6d9d8d391376cd676254df182c2c74
-  data.tar.gz: 793805bc645093a9fb92d734942cacfc02b829b772eb890ec99ab25b3936ddfda466a9addb027906aab42e483a88fb86faa3622d82189a7e9128ed66a5e00f5d
+  metadata.gz: f9a53497bf46c9536423aa72447daa280cffd7228f03afed4adaf78f94b067bc5c412f087846efc51391071b7ebf06b0fa1a4112070bea2c3a349c3fa87a8d2c
+  data.tar.gz: 531685c8afc186276dbd889705ceb2f489448a76bd39baa41ad02d870c8d912410312a93ab03463136dcc81c6fbdab9da9c08318a5186075357af25223eb6fe6

data/lib/logstash/inputs/cloudflare_logs.rb

@@ -21,7 +21,11 @@ class CloudflareAccess
 
   def start_time
     if File.exist?(metadata_file)
-      start_time = Time.parse(JSON.parse(File.read(metadata_file))['start_time']).to_datetime.rfc3339
+      begin
+        start_time = Time.parse(JSON.parse(File.read(metadata_file))['start_time']).to_datetime.rfc3339
+      rescue JSON::ParserError
+        start_time = (Time.now - (15 * 60)).to_datetime.rfc3339
+      end
     else
       start_time = (Time.now - (15 * 60)).to_datetime.rfc3339
     end
@@ -39,7 +43,7 @@ class CloudflareAccess
     if File.exist?(metadata_file)
       begin
         meta_data = JSON.parse(File.read(metadata_file))
-      rescue
+      rescue JSON::ParserError
       end
     end
 

data/logstash-input-cloudflare-logs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-cloudflare_logs'
-  s.version       = '0.1.2'
+  s.version       = '0.1.3'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = 'write cloudflare logs to logstash'
   s.description   = 'Write cloudflare lgos to logstash.' \

data/spec/inputs/cloudflare_access_spec.rb

@@ -21,6 +21,15 @@ describe CloudflareAccess do
       end
     end
 
+    it 'should return the default time meta file is there but is empty' do
+      `rm #{meta_filename}`
+      `touch #{meta_filename}`
+
+      Timecop.freeze do
+        expect(subject).to eq((Time.now - (15 * 60)).to_datetime.rfc3339)
+      end
+    end
+
     it 'should return the start time in the file if it is correct' do
       Timecop.freeze do
         File.open(meta_filename, 'w+') { |file| file.write({ start_time: Time.now - (24 * 60 * 60) }.to_json) }

data/spec/tmp/metadata.json

@@ -1 +1 @@
-{"start_time":"2017-10-18 13:35:32 -0400"}
+{"start_time":"2017-10-19 14:21:06 -0400"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-cloudflare_logs
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Josh Moore