summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2015-11-09 14:06:58 -0800
committerTim Smith <tsmith84@gmail.com>2015-11-09 14:06:58 -0800
commit26a4afcf65e001d87a0ce5c1ea71bb7150c0b81b (patch)
tree9e7fe7bd540549e2b31af3efde957ce627ca6ee2
parentdd195decc1fb75ccd905af208730d5dfb19b189b (diff)
downloadohai-26a4afcf65e001d87a0ce5c1ea71bb7150c0b81b.tar.gz
Match each column for code readability
Match each column, but skip the ones we don't need
-rw-r--r--lib/ohai/plugins/freebsd/filesystem.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/ohai/plugins/freebsd/filesystem.rb b/lib/ohai/plugins/freebsd/filesystem.rb
index 36ca8307..9b5a573a 100644
--- a/lib/ohai/plugins/freebsd/filesystem.rb
+++ b/lib/ohai/plugins/freebsd/filesystem.rb
@@ -40,20 +40,20 @@ Ohai.plugin(:Filesystem) do
end
end
- # Grab filesystem inode data from df
+ # inode parsing from 'df -iP'
so = shell_out("df -iP")
so.stdout.lines do |line|
case line
- when /^Filesystem/
+ when /^Filesystem/ # skip the header
next
- when /^(\S+)\s.+%\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(\S+)/
- filesystem = $1
+ when /^(.+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+(\d+)\s+(\d+)\s+(\d+)%(.+)$/
+ filesystem = $1.strip
fs[filesystem] ||= Mash.new
- fs[filesystem][:total_inodes] = ($2.to_i + $3.to_i).to_s
- fs[filesystem][:inodes_used] = $2
- fs[filesystem][:inodes_available] = $3
- fs[filesystem][:inodes_percent_used] = $4
- fs[filesystem][:mount] = $5
+ fs[filesystem][:inodes_used] = $6
+ fs[filesystem][:inodes_available] = $7
+ fs[filesystem][:total_inodes] = ($6.to_i + $7.to_i).to_s
+ fs[filesystem][:inodes_percent_used] = $8
+ fs[filesystem][:mount] = $9.strip
end
end