server-status 1.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c631120c269c1d0110d0874751628df18aba72ae
-  data.tar.gz: e4aa38bb8bfd2b05c69428ec316263f52255427b
+  metadata.gz: 56ef4a46984ad2e71316957017f4d31b5a2f26f2
+  data.tar.gz: 8a6c27cf422e4239fc8dd2e41f382cfc69e92733
 SHA512:
-  metadata.gz: fe9874cf9a45db31b80cc4a58ebd477e9a6c8401d677b74922fc74af003207f5eba7c835e497935ca36ea1df016887fc58e3062bf186f1086954a382ba3df0c4
-  data.tar.gz: 211d71252fe2d10305fcb4d498810500ac773cea7b88780004b422947a663e4c0c69d40b3c5f298eac1d474b9a8e5d12a74aec9973c283f27b47d120d4c4faee
+  metadata.gz: 22e0cffad9b72f8f1bffacffd004e8c4e20e61e7a587b3cc88788f29901508ed933ef2d20d9a0eae4d5b6338418beb2db3a6e8de3b1c8c4c064c0557eada634a
+  data.tar.gz: 174b62fa0905647c27ed416de8b2c71e6c92388b0a11113a26f04613de66bafe4306c4af3447690ecb8728e0417356798f5a0e1ad4d2776a8fe161f92ecffd69

data/lib/server-status/report.rb

@@ -97,8 +97,14 @@ module ServerStatus
     end
 
     def format_memory_usage(val)
-      used, available = val.split(' ').map(&:to_f)
-      format_percentage(used / (used + available))
+      # Parse /proc/meminfo values
+      meminfo_values = val.scan(/^(.+?):\s+(\d+)\skB/).map { |k,v| [ k, v.to_i ] }
+      meminfo = Hash[meminfo_values]
+
+      total_memory     = meminfo['MemTotal']
+      available_memory = meminfo['MemFree'] + meminfo['Buffers'] + meminfo['Cached']
+
+      format_percentage((total_memory - available_memory) / total_memory.to_f)
     end
 
     def format_clock_drift(val)

data/lib/server-status/status_command.rb

@@ -35,7 +35,7 @@ module ServerStatus
       end
 
       if @options.memory_usage
-        parts << "free -m | sed -n 3p | sed 's/ \\+/ /g' | cut -d\" \" -f 3-"
+        parts << "cat /proc/meminfo | grep -P '^(MemTotal|MemFree|Cached|Buffers):'"
       end
 
       if @options.clock_drift

data/lib/server-status/version.rb

@@ -1,3 +1,3 @@
 module ServerStatus
-  VERSION = '1.1'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: server-status
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 1.1.1
 platform: ruby
 authors:
 - James Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander