diff options
author | Renato Botelho <garga@FreeBSD.org> | 2013-04-30 14:09:29 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2013-04-30 14:09:29 -0300 |
commit | bc488151cc9460f86b44d9fc17da0e36fa33c80c (patch) | |
tree | 62d94ed567adabf8e88ca4f4734a47451fb4cf45 /usr/local | |
parent | af0b57cb037d82d5e4607524ebb97a5fbeb68e04 (diff) | |
download | pfsense-bc488151cc9460f86b44d9fc17da0e36fa33c80c.zip pfsense-bc488151cc9460f86b44d9fc17da0e36fa33c80c.tar.gz |
Fix and improve swap_usage()
- Fix a typo on awk syntax
- Use php functions to extract desired value from swapinfo output
Diffstat (limited to 'usr/local')
-rw-r--r-- | usr/local/www/includes/functions.inc.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php index 12cad74..2a98883 100644 --- a/usr/local/www/includes/functions.inc.php +++ b/usr/local/www/includes/functions.inc.php @@ -183,11 +183,15 @@ function disk_usage() { } function swap_usage() { - $swapUsage = `/usr/sbin/swapinfo | /usr/bin/awk '{print $5;'}|/usr/bin/grep '%'`; - $swapUsage = ereg_replace('%', "", $swapUsage); - $swapUsage = rtrim($swapUsage); + $swap_info = exec_command("/usr/sbin/swapinfo"); + $swap_used = ""; + foreach (explode("\n", $swap_info) as $line) + if (preg_match('/(\d+)%$/', $line, $matches)) { + $swap_used = $matches[1]; + break; + } - return $swapUsage; + return $swap_used; } function mem_usage() { |