From 9a394c201f8758a3050bbf0c5e5261bb1b9665ef Mon Sep 17 00:00:00 2001 From: Theodore Nordsieck Date: Tue, 10 Sep 2013 09:49:05 -0700 Subject: Converted plugins/freebsd/uptime to Mixlib::ShellOut. --- lib/ohai/plugins/freebsd/uptime.rb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/ohai/plugins/freebsd/uptime.rb b/lib/ohai/plugins/freebsd/uptime.rb index cd802ed0..db05656f 100644 --- a/lib/ohai/plugins/freebsd/uptime.rb +++ b/lib/ohai/plugins/freebsd/uptime.rb @@ -22,15 +22,12 @@ Ohai.plugin do # kern.boottime: { sec = 1232765114, usec = 823118 } Fri Jan 23 18:45:14 2009 collect_data do - popen4("#{ Ohai.abs_path( "/sbin/sysctl" )} kern.boottime") do |pid, stdin, stdout, stderr| - stdin.close - stdout.each do |line| - if line =~ /kern.boottime:\D+(\d+)/ - uptime_seconds Time.new.to_i - $1.to_i - uptime seconds_to_human(uptime_seconds) - end + so = shell_out("#{ Ohai.abs_path( "/sbin/sysctl" )} kern.boottime") + so.stdout.lines do |line| + if line =~ /kern.boottime:\D+(\d+)/ + uptime_seconds Time.new.to_i - $1.to_i + uptime seconds_to_human(uptime_seconds) end end end end - -- cgit v1.2.1