process-metrics 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c70d72392b299b8219b1bb1d5762de8d4ee116568ebd4ada928ba946d3ae96
-  data.tar.gz: d0c5a4ab4a3fd2935e95667fff758c20c87f14165776dec5b908f544cc24a590
+  metadata.gz: b288419449c98ce2b53cc2ecb8d3d2660a473c17677b66e6f18015b803db1482
+  data.tar.gz: 67b4d639f7744814e47e61aac54ef7c588557a94ca8454926594d742f9cf88ce
 SHA512:
-  metadata.gz: 91961040cacd7a310a28ab42b76ff4f73386bdbd77a36138b7e5e4a3704fed2e6184ad493629ad501e45473c0013bbe675a4c159d74efc723a1cdb138b1a1df7
-  data.tar.gz: 9de09390fbc96a7dc208914fd18aeed8d0380f49fb3bc4ab8bf33ec1e15dba671d48921eb71460a33aba779d409cd4180c7f811f42ff736ddd4bf48d2971958e
+  metadata.gz: 0a1686b0609d8009a2d5a26b659876c29c5378d89b35b39777b5d55d53413b2a10558470075ce0303959f77213ceef101cad19547dc95743440d0243af2746e1
+  data.tar.gz: 13a3e9bbc06eb5412a6b37c499f531eebf58317c1944d0e679dd68d8b87abc4450e62b7166c435334745555d26bb873b9ddc47d65324bdf17832b27865f60a2c

data/lib/process/metrics/general.rb

@@ -137,25 +137,40 @@ module Process
 			#
 			# @parameter pid [Integer] The process ID to capture.
 			# @parameter ppid [Integer] The parent process ID to capture.
-			def self.capture(pid: nil, ppid: nil, ps: PS, memory: Memory.supported?)
-				input, output = IO.pipe
+			def self.capture(pid: nil, ppid: nil, memory: Memory.supported?)
+				ps_pid = nil
 				
-				arguments = [ps]
-				
-				if pid && ppid.nil?
-					arguments.push("-p", Array(pid).join(","))
-				else
-					arguments.push("ax")
+				# Extract the information from the `ps` command:
+				header, *lines = IO.pipe do |input, output|
+					arguments = [PS]
+					
+					if pid && ppid.nil?
+						arguments.push("-p", Array(pid).join(","))
+					else
+						arguments.push("ax")
+					end
+					
+					arguments.push("-o", FIELDS.keys.join(","))
+					
+					ps_pid = Process.spawn(*arguments, out: output)
+					output.close
+					
+					input.readlines.map(&:strip)
+				ensure
+					input.close
+					
+					if ps_pid
+						begin
+							# Make sure to kill the ps process if it's still running:
+							Process.kill(:KILL, ps_pid)
+							# Reap the process:
+							Process.wait(ps_pid)
+						rescue => error
+							warn "Failed to cleanup ps process #{ps_pid}:\n#{error.full_message}"
+						end
+					end
 				end
 				
-				arguments.push("-o", FIELDS.keys.join(","))
-				
-				ps_pid = Process.spawn(*arguments, out: output, pgroup: true)
-				
-				output.close
-				
-				header, *lines = input.readlines.map(&:strip)
-				
 				processes = {}
 				
 				lines.map do |line|
@@ -187,8 +202,6 @@ module Process
 				end
 				
 				return processes
-			ensure
-				Process.wait(ps_pid) if ps_pid
 			end
 		end
 	end

data/lib/process/metrics/memory/linux.rb

@@ -71,8 +71,8 @@ module Process
 						
 						return usage
 					end
-				rescue Errno::ENOENT, Errno::ESRCH
-					# Process doesn't exist.
+				rescue Errno::ENOENT, Errno::ESRCH, Errno::EACCES
+					# Process doesn't exist or we can't access it.
 					return nil
 				end
 			elsif File.readable?("/proc/self/smaps")
@@ -105,8 +105,8 @@ module Process
 						
 						return usage
 					end
-				rescue Errno::ENOENT, Errno::ESRCH
-					# Process doesn't exist.
+				rescue Errno::ENOENT, Errno::ESRCH, Errno::EACCES
+					# Process doesn't exist or we can't access it.
 					return nil
 				end
 			else

data/lib/process/metrics/version.rb

@@ -7,6 +7,6 @@
 module Process
 	# @namespace
 	module Metrics
-		VERSION = "0.7.0"
+		VERSION = "0.8.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process-metrics
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams