logstash-input-drupal_dblog 0.1.7-java → 2.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da385a2ba594cec801f5e79c62409eb22ca6d3ca
-  data.tar.gz: f98d793ba28ed52e3f116c82f626885719cf4049
+  metadata.gz: fde8c6ff335e9741db39a6c6488f32426898d7b8
+  data.tar.gz: 84ccb08340c9e926321778581eee982ae9b211bb
 SHA512:
-  metadata.gz: 7f875bd00452139cb0492d31df887eff007fb7ded2d35601df087151f1ef604167047d918d10df38617f4bc32cd65a7cecefdb9ace6bdc92fbaf7fb63aa5995b
-  data.tar.gz: ffc66e492d6da30a996851f54bc3be3a8ab25ba3513fda9e73c891a9667a8a4e08fe0740e0d91eb7631c123aa0f84109e5c1ff1077a7a63fde65facf6d5703aa
+  metadata.gz: bc72da5bb763eca816c57fa36a661911804993e78777f60292ca4b4f603a7ba6de84ca54d297b7ee5baf71ac1c5f92aac2d3cf1f572434cb6976e4b011b3b6db
+  data.tar.gz: 15ff5e1830aaac955ae7d11f54aa235e7ab68c5cdeb1136079f7540cc1e3d61a432d1e8d2cf98a04104bc0128293937d2d6ac7cb48c9b550df2760509a00797a

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+

data/NOTICE.TXT

@@ -0,0 +1,5 @@
+Elasticsearch
+Copyright 2012-2015 Elasticsearch
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).

data/README.md

@@ -1,19 +1,19 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com mailing list.
+Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/drupal_dblog.rb

@@ -2,7 +2,8 @@
 require "date"
 require "logstash/inputs/base"
 require "logstash/namespace"
-
+require "logstash-input-drupal_dblog_jars"
+require "stud/interval"
 
 # Retrieve watchdog log events from a Drupal installation with DBLog enabled.
 # The events are pulled out directly from the database.
@@ -115,7 +116,7 @@ class LogStash::Inputs::DrupalDblog < LogStash::Inputs::Base
   def run(output_queue)
     @logger.info("Initializing drupal_dblog")
 
-    loop do
+    while !stop?
       @logger.debug("Drupal DBLog: Starting to fetch new watchdog entries")
       start = Time.now.to_i
 
@@ -133,9 +134,11 @@ class LogStash::Inputs::DrupalDblog < LogStash::Inputs::Base
       sleepTime = @interval * 60 - timeTaken
       if sleepTime > 0
         @logger.debug("Drupal DBLog: Sleeping for #{sleepTime} seconds")
-        sleep(sleepTime)
+        Stud.stoppable_sleep(sleepTime) do
+          stop?
+        end
       end
-    end # loop
+    end
   end # def run
 
   private
@@ -195,7 +198,7 @@ class LogStash::Inputs::DrupalDblog < LogStash::Inputs::Base
       end
 
       # Fetch new entries, and create the event
-      while true
+      while !stop?
         results = get_db_rows(lastWid)
         if results.length() < 1
           break

data/logstash-input-drupal_dblog.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-drupal_dblog'
-  s.version         = '0.1.7'
+  s.version         = '2.0.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Retrieve watchdog log events from a Drupal installation with DBLog enabled"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
 
-  s.add_runtime_dependency 'logstash-core', '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.snapshot", "< 3.0.0"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'php_serialize'
+  s.add_runtime_dependency 'stud', '~> 0.0.22'
 
   if RUBY_PLATFORM == 'java'
     s.platform = RUBY_PLATFORM

data/spec/inputs/drupal_dblog_spec.rb

@@ -1 +1,8 @@
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/inputs/drupal_dblog"
+
+describe LogStash::Inputs::DrupalDblog do
+  it_behaves_like "an interruptible input plugin" do
+    let(:config) { { "databases" => {} } }
+  end
+end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-drupal_dblog
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 2.0.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.snapshot
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
@@ -26,10 +26,10 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.snapshot
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -58,6 +58,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.22
+  name: stud
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.22
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -92,12 +106,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
+- NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash-input-drupal_dblog_jars.rb
 - lib/logstash/inputs/drupal_dblog.rb
 - lib/logstash/inputs/drupal_dblog/jdbcconnection.rb
@@ -126,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Retrieve watchdog log events from a Drupal installation with DBLog enabled

data/.gitignore

@@ -1,3 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"