capelinhos 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 259f8c17e8e1d4907906ad0a5a69bc4c7ff46f284f4492657bdcdd9eb77dc1ed
-  data.tar.gz: 16156b9dd200f5ad4add2b66e130044f3bf4c0caf052370ff382b3ef299c89b7
+  metadata.gz: 78e1daf01cf2cdb53f94de1f68f88d014ae4f5d849a1efd13f5db6bec159b0b6
+  data.tar.gz: 44a494709edc3bd69d4a00a76dc2ca3ddb28b9950fe17414c34768d26a0b1e71
 SHA512:
-  metadata.gz: 37e66c20f4a62e8965766564aaee96d66e730c36011872cbd62fdb93d8061e4143255fdff603652d62ac542372ac935196d11698d9e49ada9b9152f5afd8bfb3
-  data.tar.gz: 99551500dbf149aeea945c4cad61950cf4b36a752381cc2b8791b9af06b1ff2e674d0828bb296b54e6bc4eb9e4f34ad541fb42d446709861735bfb1854c23109
+  metadata.gz: 7b4fdaecc769d87f5b0649bb9b00f90e8aade2c5c5c0901b5eef16c348b24b75ee4ec190cc9f6b2cf87e8721dd4d8726ba08ec984df0a42c97c5260850cbe397
+  data.tar.gz: fd64de034e829cf6dbe88a7d00bda14a7e536cb3fd09bf56124d2420ff31f1695d9ec7fd0686cca79a17f8ef61dc04eec22f474fd710ae0104f87e2715c16217

data/lib/capelinhos/processor.rb

@@ -14,9 +14,15 @@ module Capelinhos
       stats = AdminTools::MemoryStats.new
       processes = stats.passenger_processes
 
+      if !supports_private_dirty_rss?(processes)
+        puts "This system doesn't support private dirty RSS. Falling back to RSS"
+      end
+
+      rss_type = supports_private_dirty_rss?(processes) ? :private_dirty_rss : :rss
+
       processes.each do |process|
         if process.name.include?('RubyApp')
-          rss_megabytes = process.rss / 1024
+          rss_megabytes = process.send(rss_type) / 1024
           if rss_megabytes > @memory_threshold
             shutdown_process(process.pid)
             processes_killed += 1
@@ -31,6 +37,10 @@ module Capelinhos
 
     private
 
+    def supports_private_dirty_rss?(processes)
+      processes.any?{|p| !p.private_dirty_rss.nil?}
+    end
+
     def shutdown_process(pid)
       _instance = instance
       request = Net::HTTP::Post.new("/pool/detach_process.json")

data/lib/capelinhos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capelinhos
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capelinhos
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Adam Hallett