capelinhos 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 259f8c17e8e1d4907906ad0a5a69bc4c7ff46f284f4492657bdcdd9eb77dc1ed
-  data.tar.gz: 16156b9dd200f5ad4add2b66e130044f3bf4c0caf052370ff382b3ef299c89b7
+  metadata.gz: 30ba1d3bdde57e67c96ca434db1ff4d5d92f10482bea94657c2e22e71ad5be3c
+  data.tar.gz: f0c6ab2f8a48c95cd5e8e4f9b6e4f3c5ee7edc5a417f76232c298bc6e314f472
 SHA512:
-  metadata.gz: 37e66c20f4a62e8965766564aaee96d66e730c36011872cbd62fdb93d8061e4143255fdff603652d62ac542372ac935196d11698d9e49ada9b9152f5afd8bfb3
-  data.tar.gz: 99551500dbf149aeea945c4cad61950cf4b36a752381cc2b8791b9af06b1ff2e674d0828bb296b54e6bc4eb9e4f34ad541fb42d446709861735bfb1854c23109
+  metadata.gz: 84db606af25c313d13bcf42cb5d1da22f508db71599e5842d4d18a9bca1e44f08fb459f092282d7728c543d8854b791f77d76060d4df1267bf4b039a98bbed56
+  data.tar.gz: d490f9e85e3e84a970fffa7b1ee83d64580e278014c5c57b908e2948aa2be745810d3a65812a41165ca06d887f11bd14080ab7f852698e66ed5ad9665f0d9b6a

data/README.md

@@ -4,7 +4,9 @@ This gem gracefully stops Passenger Ruby processes that have exceeded a memory t
 
 If Phusion Passenger is configured with `PassengerMinInstances` and the number of processes is under that number, then a new process should replace the processes that were shutdown.
 
-Note: This doesn't skip active long running sessions. This feature be added as a default in the future.
+## TODO
+
+* Implement support for multiple Passenger Instances
 
 ## Installation
 
@@ -18,8 +20,10 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Usage
 
-# kill up to 3 processes that use more than 400 megabytes
+```cli
+# shutdown up to 3 processes that use more than 400 megabytes of memory
 $ capelinos --max-memory 400 --max-processes 3
+```
 
 ## Development
 

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.7.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capelinhos
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Adam Hallett
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-30 00:00:00.000000000 Z
+date: 2024-03-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: passenger
   requirement: !ruby/object:Gem::Requirement