logstash-input-yasuri 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01cf6f81b0de10a81ff1ddf0cd447e9d9b403fbd
-  data.tar.gz: 25c33d37b927c64bf413709386b500fad9a34ac8
+  metadata.gz: 8a398466bd2c3c647f1af3ce24d4d85a4e3fda4e
+  data.tar.gz: 52b05b250914f5b625cebabdad0ee6cc146e2a96
 SHA512:
-  metadata.gz: 513917038a3714b3eacd95374446f6ff982c9744101630da21dc350fae34f047ac15ab6eaff80bff00e2d4845c215898ec9dab5685a1baa92794e95b05f02149
-  data.tar.gz: d923a7ffebee5d919046ba0479d9b02eed495307d679ac67d05642df1bf8600b4242a7efb8a5196e0588ded9886673dafb243e3d9aa68a18be777daed6f7afa0
+  metadata.gz: acf625642555c0b701e192c56a187c8ccf47c6b38bd0821b8a26a406a7dba9eef113903f502f95075758e2168e52dd82b7944ac38583fe6f7ffb12e3c00853e2
+  data.tar.gz: 98bea8ee7ef765d86edb800f43a9fc2a0829469acbab81431a6e3f67243cd6544a84438d6da19fe8d15008af928ca161e7885efbc19e1055228b81ae2e0c51bb

data/lib/logstash/inputs/yasuri.rb

@@ -2,6 +2,7 @@
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket" # for Socket.gethostname
+require "rufus-scheduler"
 require "mechanize"
 require "yasuri"
 
@@ -26,12 +27,13 @@ class LogStash::Inputs::Yasuri < LogStash::Inputs::Base
   # Split each results to individual events (struct or pages)
   config :split, :default => false
 
-  config :interval, :validate => :number, :default => 60
+  config :cron, :validate => :string, :default => '* * * * *'
 
   public
   def register
     @host = Socket.gethostname
     @agent = Mechanize.new
+    @scheduler = Rufus::Scheduler.new
 
     # If given both, logstash-input-yasuri use :parse_tree.
     tree = @parse_tree || File.read(@parse_tree_path)
@@ -41,14 +43,13 @@ class LogStash::Inputs::Yasuri < LogStash::Inputs::Base
 
   def run(queue)
     # we can abort the loop if stop? becomes true
-    while !stop?
+    scheduler.cron @cron do
       # because the sleep interval can be big, when shutdown happens
       # we want to be able to abort the sleep
       # Stud.stoppable_sleep will frequently evaluate the given block
       # and abort the sleep(@interval) if the return value is true
       inner_run(queue)
-      Stud.stoppable_sleep(@interval) { stop? }
-    end # loop
+    end
   end # def run
 
   def stop
@@ -57,6 +58,7 @@ class LogStash::Inputs::Yasuri < LogStash::Inputs::Base
     #  * close sockets (unblocking blocking reads/accepts)
     #  * cleanup temporary files
     #  * terminate spawned threads
+    @scheduler.shutdown
   end
 
   def inner_run(queue)

data/logstash-input-yasuri.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-yasuri'
-  s.version         = '2.0.4'
+  s.version         = '2.0.5'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Web scraping input plugin for logstash."
   s.description     = "Web scraping input plugin for logstash."
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logstash-core-plugin-api', '~> 1'
   s.add_runtime_dependency 'stud', '>= 0.0.22'
   s.add_runtime_dependency 'yasuri', '~> 1.9'
+  s.add_runtime_dependency 'rufus-scheduler', '>= 0'
 
   s.add_development_dependency 'logstash-devutils', '>= 0.0.16'
   s.add_development_dependency 'logstash-codec-plain'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-yasuri
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - tac0x2a
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rufus-scheduler
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: