From 861856fbd966d874450d5435dcb56dc332d7f99e Mon Sep 17 00:00:00 2001 From: "Wei, He" Date: Tue, 29 Nov 2016 16:29:54 +0900 Subject: [PATCH] fix bug: RegExp in processes resource can't match long-run process #1332 Signed-off-by: Wei, He --- lib/resources/processes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/resources/processes.rb b/lib/resources/processes.rb index 0955d6d7f..a20e6e613 100644 --- a/lib/resources/processes.rb +++ b/lib/resources/processes.rb @@ -48,7 +48,7 @@ module Inspec::Resources if os.linux? command = 'ps axo label,pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user:32,command' - regex = /^([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+(.*)$/ + regex = /^([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+(\w{3} \d{2}|\d{2}:\d{2}:\d{2})\s+([^ ]+)\s+([^ ]+)\s+(.*)$/ else command = 'ps axo pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user,command' regex = /^\s*([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+(.*)$/