server-status 1.1 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c631120c269c1d0110d0874751628df18aba72ae
4
- data.tar.gz: e4aa38bb8bfd2b05c69428ec316263f52255427b
3
+ metadata.gz: 56ef4a46984ad2e71316957017f4d31b5a2f26f2
4
+ data.tar.gz: 8a6c27cf422e4239fc8dd2e41f382cfc69e92733
5
5
  SHA512:
6
- metadata.gz: fe9874cf9a45db31b80cc4a58ebd477e9a6c8401d677b74922fc74af003207f5eba7c835e497935ca36ea1df016887fc58e3062bf186f1086954a382ba3df0c4
7
- data.tar.gz: 211d71252fe2d10305fcb4d498810500ac773cea7b88780004b422947a663e4c0c69d40b3c5f298eac1d474b9a8e5d12a74aec9973c283f27b47d120d4c4faee
6
+ metadata.gz: 22e0cffad9b72f8f1bffacffd004e8c4e20e61e7a587b3cc88788f29901508ed933ef2d20d9a0eae4d5b6338418beb2db3a6e8de3b1c8c4c064c0557eada634a
7
+ data.tar.gz: 174b62fa0905647c27ed416de8b2c71e6c92388b0a11113a26f04613de66bafe4306c4af3447690ecb8728e0417356798f5a0e1ad4d2776a8fe161f92ecffd69
@@ -97,8 +97,14 @@ module ServerStatus
97
97
  end
98
98
 
99
99
  def format_memory_usage(val)
100
- used, available = val.split(' ').map(&:to_f)
101
- format_percentage(used / (used + available))
100
+ # Parse /proc/meminfo values
101
+ meminfo_values = val.scan(/^(.+?):\s+(\d+)\skB/).map { |k,v| [ k, v.to_i ] }
102
+ meminfo = Hash[meminfo_values]
103
+
104
+ total_memory = meminfo['MemTotal']
105
+ available_memory = meminfo['MemFree'] + meminfo['Buffers'] + meminfo['Cached']
106
+
107
+ format_percentage((total_memory - available_memory) / total_memory.to_f)
102
108
  end
103
109
 
104
110
  def format_clock_drift(val)
@@ -35,7 +35,7 @@ module ServerStatus
35
35
  end
36
36
 
37
37
  if @options.memory_usage
38
- parts << "free -m | sed -n 3p | sed 's/ \\+/ /g' | cut -d\" \" -f 3-"
38
+ parts << "cat /proc/meminfo | grep -P '^(MemTotal|MemFree|Cached|Buffers):'"
39
39
  end
40
40
 
41
41
  if @options.clock_drift
@@ -1,3 +1,3 @@
1
1
  module ServerStatus
2
- VERSION = '1.1'
2
+ VERSION = '1.1.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: server-status
3
3
  version: !ruby/object:Gem::Version
4
- version: '1.1'
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Brooks
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-20 00:00:00.000000000 Z
11
+ date: 2017-02-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: commander