logstash-input-eventlog 0.1.2-java → 0.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e01779d1a06b9c7687564d99496391957dd25a2f
-  data.tar.gz: ed15a29635ffcf43219a64dd5e033b5e5373af36
+  metadata.gz: 8f7afe615c71058a8e7a55e8d0e37a4a28a4c13a
+  data.tar.gz: 80d1a2114793d4f0e9cf228790364bbb5d92e865
 SHA512:
-  metadata.gz: 8f2b991c8b56b3ddd813207e34c30bfee330207213e19ab06fef6a780cabeb9247a3061d478ee26650e242a32b7d732ca78d60616d932f531f0f0c54c7db998b
-  data.tar.gz: 3d5c28fa37ce7ceae1b895640fa524a349b2c8837244ba16e9991b224aea413d7c881398bce87e1f33b9bdf12ed30e6c675850e475b66a8ad0bcb9ae3285b46a
+  metadata.gz: b05baac4aa905755e3ed7fe6515c195550e779c15e317c863914cec5fa2885914c57d82e8da0718bd0a8f059723d5c99b567aee222f124e967d5def902e0327b
+  data.tar.gz: c5bcf1724168da8b561bd57cd99da4ed38ee4756950fe6099793fa5d6d36c8597e00975740affa1d4fceb199c74edc1fa01fadc0390e11233094945ef563a0d3

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
-gemspec
-gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"
+gemspec

data/README.md

@@ -22,7 +22,7 @@ Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com
 #### Code
 - To get started, you'll need JRuby with the Bundler gem installed.
 
-- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization.
+- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. We also provide [example plugins](https://github.com/logstash-plugins?query=example).
 
 - Install dependencies
 ```sh
@@ -31,26 +31,15 @@ bundle install
 
 #### Test
 
-```sh
-bundle exec rspec
-```
+- Update your dependencies
 
-The Logstash code required to run the tests/specs is specified in the `Gemfile` by the line similar to:
-```ruby
-gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"
-```
-To test against another version or a local Logstash, edit the `Gemfile` to specify an alternative location, for example:
-```ruby
-gem "logstash", :github => "elasticsearch/logstash", :ref => "master"
-```
-```ruby
-gem "logstash", :path => "/your/local/logstash"
+```sh
+bundle install
 ```
 
-Then update your dependencies and run your tests:
+- Run tests
 
 ```sh
-bundle install
 bundle exec rspec
 ```
 
@@ -58,13 +47,13 @@ bundle exec rspec
 
 #### 2.1 Run in a local Logstash clone
 
-- Edit Logstash `tools/Gemfile` and add the local plugin path, for example:
+- Edit Logstash `Gemfile` and add the local plugin path, for example:
 ```ruby
 gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
-- Update Logstash dependencies
+- Install plugin
 ```sh
-rake vendor:gems
+bin/plugin install --no-verify
 ```
 - Run Logstash with your plugin
 ```sh
@@ -74,6 +63,8 @@ At this point any modifications to the plugin code will be applied to this local
 
 #### 2.2 Run in an installed Logstash
 
+You can use the same **2.1** method to run your plugin in an installed Logstash by editing its `Gemfile` and pointing the `:path` to your local plugin development directory or you can build the gem and install it using:
+
 - Build your plugin gem
 ```sh
 gem build logstash-filter-awesome.gemspec
@@ -90,6 +81,6 @@ All contributions are welcome: ideas, patches, documentation, bug reports, compl
 
 Programming is not a required skill. Whatever you've seen about open source and maintainers or community members  saying "send patches or die" - you will not see that here.
 
-It is more important to me that you are able to contribute.
+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/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/eventlog.rb

@@ -50,8 +50,8 @@ class LogStash::Inputs::EventLog < LogStash::Inputs::Base
 
       events = @wmi.ExecNotificationQuery(wmi_query)
 
-      while
-        notification = events.NextEvent
+      loop do
+        notification = events.NextEvent(1000) #timeout is 1000 ms
         event = notification.TargetInstance
 
         timestamp = to_timestamp(event.TimeGenerated)
@@ -87,8 +87,10 @@ class LogStash::Inputs::EventLog < LogStash::Inputs::Base
         decorate(e)
         queue << e
 
-      end # while
+      end # loop
 
+    rescue LogStash::ShutdownSignal
+      return
     rescue Exception => ex
       @logger.error("Windows Event Log error: #{ex}\n#{ex.backtrace}")
       sleep 1

data/logstash-input-eventlog.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-eventlog'
-  s.version         = '0.1.2'
+  s.version         = '0.1.4'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This input will pull events from a Windows Event Log"
   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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash', '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
 
   s.add_runtime_dependency 'logstash-codec-plain'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-eventlog
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: java
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -19,7 +19,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash
+  name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: This input will pull events from a Windows Event Log