stress_reporter 0.0.2 → 0.0.3

data/bin/stress_reporter

@@ -3,10 +3,13 @@
 require 'stress_reporter'
 require 'stress_reporter/checker'
 require 'stress_reporter/actions/xmanager'
+require 'stress_reporter/actions/free'
 
 @_logger = Logger.new("/var/log/stress_report/monitor.log")
-puts "Going to trigger when load average exceeds #{StressReporter::Checker::LIMIT}"
+puts "Going to trigger when load average exceeds #{ StressReporter::Checker::LIMIT }"
+VERBOSE = true
 
+# Define out own exception to raise in main loop
 class MyTimeoutException < Exception ; end
 
 # Initial delay between checks
@@ -14,7 +17,7 @@ class MyTimeoutException < Exception ; end
 
 def log severity, msg
   @_logger.send severity, msg
-  puts "#{ severity }: #{ msg }"
+  puts "#{ severity }: #{ msg }" if VERBOSE
 end
 
 
@@ -24,9 +27,14 @@ while true do
     SystemTimer.timeout_after(StressReporter::TIMEOUT, MyTimeoutException) do
       if StressReporter::Checker.go?
         log(:warn, "Load average of #{ StressReporter::Checker::LIMIT } Exceeded: (#{ StressReporter::Checker.load_average }) - running checks")
+        log(:info, "**** Xmanager ****")
         StressReporter::Actions::Xmanager.report.each {|l|
           log(:info, l)
         }
+        log(:info, "**** Free ****")
+        StressReporter::Actions::Free.report.each {|l|
+          log(:info, l)
+        }
       end
     end
     @delay = @delay - 1.0

data/lib/stress_reporter/actions/free.rb

@@ -0,0 +1,15 @@
+module StressReporter
+  module Actions
+    # Actions to report on passenger usage.
+    # Current requests, urls, pids
+    # TODO: We should not assume that xm_last_url_for_{pid} are in /tmp
+    # TODO: Spawning passenger-status is slow
+    class Free
+
+      # Report returns a string array
+      def self.report
+        `free`.map(&:chomp)
+      end
+    end
+  end
+end

data/lib/stress_reporter/actions/xmanager.rb

@@ -22,30 +22,18 @@ module StressReporter
 
       # Returns array of pids of current passenger processes
       def self.pids
-        pids = []
-        p = IO.popen(CMD)
-        while !p.eof?
-          line = p.readpartial(1024)
-          m = line.scan PID_REGEX
-          pids = m.flatten
-        end
-        pids
+        p = `#{ CMD }`
+        p.scan(PID_REGEX).flatten
       end
 
       # Returns hash { pid => url }
       def self.current_requests
         requests = {}
         pids.each do |pid|
-          if File.exist?("/tmp/xm_last_url_for_#{pid}")
-            p = IO.popen("cat /tmp/xm_last_url_for_#{pid}")
-            while !p.eof?
-              requests[pid] = p.readpartial(1024).chomp
-            end
-          end
+          requests[pid] = File.read("/tmp/xm_last_url_for_#{ pid }").chomp
         end
         requests
       end
-
     end
   end
 end

data/lib/stress_reporter/version.rb

@@ -1,3 +1,3 @@
 module StressReporter
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stress_reporter
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Marcello Colacino
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-23 00:00:00 Z
+date: 2012-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -78,6 +78,7 @@ files:
 - Rakefile
 - bin/stress_reporter
 - lib/stress_reporter.rb
+- lib/stress_reporter/actions/free.rb
 - lib/stress_reporter/actions/xmanager.rb
 - lib/stress_reporter/checker.rb
 - lib/stress_reporter/version.rb