logstash-input-perfmon 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce15adf592fe00372c2a7a6ce1096061e3ec3eeb
-  data.tar.gz: 8089cc9ae91769a6cd7302718a842ed8e7ec1896
+  metadata.gz: 68cc247a345a96ce083538b3e7f661ab7a81b151
+  data.tar.gz: f27f18efd369769692d7ec7f3b0b1856eb497a70
 SHA512:
-  metadata.gz: e9e551be0c097c1c7354c7ad2a12ea7a586a434e8ef0a489ee69f47c1512ff55d628ab4eba0d667dbb7fba7c06afb0044dfeed1afb8f44f8cb0766427cafa43d
-  data.tar.gz: f18d9108332f3cfd195f6b776c67d77ed11d6b68aa0259f6a5b444e28bbc25b0aa493ac3a37525caf40f5b06018d5cfc6d2d084031874a6bf5c9365580b07fa3
+  metadata.gz: dc35795a90643171fbd743d2691eb59d0cfa51c259e8e3af5acc64fa23c6cce2de03d8c5e08c8feebf25a6df52863abfbc9675605219fc9ca36007f14d56f176
+  data.tar.gz: 4a91279ddd0072c9d445281bff0728c1df4762b414b60285ef1ab2ebc08dc58691a5a03465ff1aa3d6e3b3493fba95a708cb578c8570c6b8bacc782a762985e9

data/README.md

@@ -32,7 +32,7 @@ plugin install path\to\gem
 If you aren't building the gem yourself, you can install it directly from rubygems.org:
 ```
 cd path\to\logstash\bin
-plugin install logstah-input-perfmon
+plugin install logstash-input-perfmon
 ```
 	
 Create a configuration file. The following collects three metrics every ten seconds:

data/lib/logstash/inputs/perfmon.rb

@@ -67,7 +67,7 @@ class LogStash::Inputs::Perfmon < LogStash::Inputs::Base
   # [queue] The queue to add new events to
   def run(queue)
     @typeperf.start_monitor
-	
+    
     @logger.debug("Started perfmon monitor")
 
     while @typeperf.alive?
@@ -75,9 +75,9 @@ class LogStash::Inputs::Perfmon < LogStash::Inputs::Base
 
       @codec.decode(data) do |event|
         decorate(event)
-		
+        
         event['host'] = @host
-		
+        
         queue << event
         @logger.debug("Added event to queue: #{event}")
       end

data/lib/logstash/inputs/perfmon_proc_getter.rb

@@ -14,19 +14,18 @@ class PerfmonProcGetter
   # [output_queue] The queue to add each new message to
   def start_process(counters, interval, output_queue)
     cmd = get_typeperf_command(counters, interval)
-	
-	Open3.popen3(cmd) do |w, r, e, thr|
+    
+    Open3.popen3(cmd) do |w, r, e, thr|
+    
+      wait_for_process_id_to_be_set(thr)
+    
       while line = r.gets
-	    if @pid.nil?
-	      @pid = thr.pid
-		end
-      
-	    next if counters.any? { |counter| line.include? counter } # don't show lines that contain headers
-	    line.gsub!('"', '') # remove quotes
-	    line.strip!
-	    output_queue << line
+        next if counters.any? { |counter| line.include? counter } # don't show lines that contain headers
+        line.gsub!('"', '') # remove quotes
+        line.strip!
+        output_queue << line
       end
-	end
+    end
   end
   
   # Kills the typeperf process
@@ -73,4 +72,13 @@ class PerfmonProcGetter
   def wait_for_process_to_start
     sleep 0.5 until proc_is_running?
   end
+  
+  # Waits until the PID is set
+  # [thr] The object containing process info like the PID
+  def wait_for_process_id_to_be_set(thr)
+    while @pid.nil?
+      @pid = thr.pid
+      sleep 0.5
+    end
+  end
 end

data/lib/logstash/inputs/typeperf_wrapper.rb

@@ -41,10 +41,10 @@ class TypeperfWrapper
   
   # Waits until a new message is put onto the queue, then returns it
   def get_next
-    while @msg_queue.empty?
+    while alive? && @msg_queue.empty?
       sleep 0.5 
     end
-	
+    
     @msg_queue.pop
   end
   
@@ -55,7 +55,7 @@ class TypeperfWrapper
     Thread.new do
       @perfmon_proc_getter.start_process(@counters, @interval, @msg_queue)
     end
-	
+    
     @perfmon_proc_getter.wait_for_process_to_start
   end
 end

data/logstash-input-perfmon.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-perfmon'
-  s.version = '0.1.5'
+  s.version = '0.1.6'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Logstash input for Windows Performance Monitor"
   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. Logstash input for Windows Performance Monitor metrics."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-perfmon
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nick Ramirez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement