stress_reporter 0.0.1 → 0.0.2

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*~

data/bin/stress_reporter

@@ -4,31 +4,35 @@ require 'stress_reporter'
 require 'stress_reporter/checker'
 require 'stress_reporter/actions/xmanager'
 
-logger = Logger.new("/tmp/check_senato_status_#{Time.now.strftime('%Y.%d.%m')}.log")
+@_logger = Logger.new("/var/log/stress_report/monitor.log")
 puts "Going to trigger when load average exceeds #{StressReporter::Checker::LIMIT}"
 
 class MyTimeoutException < Exception ; end
 
+# Initial delay between checks
 @delay = 10.0;
 
+def log severity, msg
+  @_logger.send severity, msg
+  puts "#{ severity }: #{ msg }"
+end
+
+
 while true do
   begin
+    # Use custom exception so that we can treat it differenty
     SystemTimer.timeout_after(StressReporter::TIMEOUT, MyTimeoutException) do
       if StressReporter::Checker.go?
-        puts "Ecceduto!"
+        log(:warn, "Load average of #{ StressReporter::Checker::LIMIT } Exceeded: (#{ StressReporter::Checker.load_average }) - running checks")
         StressReporter::Actions::Xmanager.report.each {|l|
-          line = "#{Time.now.strftime('%Y/%d/%m %H:%M:%S')}\t#{StressReporter::Checker.load_average}\t#{ line }"
-          puts line
-          logger.info line
+          log(:info, l)
         }
       end
     end
     @delay = @delay - 1.0
   rescue MyTimeoutException
     @delay = @delay * 2
-    msg = "#{Time.now.strftime('%Y/%d/%m %H:%M:%S')} Timeout Error executing checks and reporting, doubling time between checks"
-    logger.error msg
-    puts msg
+    log(:error, "Timeout Error executing checks and reporting, machine is trashing, doubling time between checks to #{ @delay }")
   end
 
   if @delay > 60.0
@@ -36,6 +40,7 @@ while true do
   elsif @delay < 5.0
     @delay = 5.0
   end
-  puts "Sleeping for #@delay"
+  log(:debug, "Sleeping for #@delay")
   sleep @delay
 end
+

data/lib/stress_reporter/actions/xmanager.rb

@@ -1,14 +1,15 @@
 module StressReporter
   module Actions
-    # Azioni da intraprendere per reportare sullo stato di xmanager.
-    # Richieste correnti, loro url, pid etc.
-    # TODO: Non assumere che i files xm_last_url_for_{pid} siano in /tmp
+    # 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 Xmanager
 
       CMD = "passenger-status"
       PID_REGEX = /PID:\s*(\d+)/
 
-      # Report torna un array di stringhe
+      # Report returns a string array
       def self.report
         out = []
         Xmanager.current_requests.each_pair do |pid, url|
@@ -19,6 +20,7 @@ module StressReporter
 
       private
 
+      # Returns array of pids of current passenger processes
       def self.pids
         pids = []
         p = IO.popen(CMD)
@@ -30,13 +32,14 @@ module StressReporter
         pids
       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)
+              requests[pid] = p.readpartial(1024).chomp
             end
           end
         end

data/lib/stress_reporter/checker.rb

@@ -13,7 +13,7 @@ class StressReporter::Checker
 
   # Returns true if limit exceeded. Sets @@load_average
   def self.go?
-    @@load_average = Sys::CPU.load_avg[0]
+    @@load_average = Sys::CPU.load_avg[0].to_f
     @@load_average > LIMIT
   end
 

data/lib/stress_reporter/version.rb

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

data/stress_reporter.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.name          = "stress_reporter"
   gem.version       = StressReporter::VERSION
   gem.authors       = ["Marcello Colacino", "Luca S.G. de Marinis"]
-  gem.email         = ["loop23@gmail.com"]
+  gem.email         = ["marcello.colacino@interact.it", "loop23@gmail.com"]
   gem.description   = %q{Daemon that runs and reports on stressful stuff}
   gem.summary       = %q{Was born with specific needs but may be extended to cover more scenarios}
   gem.homepage      = "https://github.com/InteractSpa/stress_reporter"
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency 'sys-cpu'
-  gem.add_runtime_dependency 'passenger'
+#  gem.add_runtime_dependency 'passenger'
   gem.add_runtime_dependency 'SystemTimer'
 
   gem.add_development_dependency 'rake'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stress_reporter
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Marcello Colacino
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: passenger
+  name: SystemTimer
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,7 +48,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: SystemTimer
+  name: rake
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,23 +59,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
   type: :development
 description: Daemon that runs and reports on stressful stuff
 email: 
+- marcello.colacino@interact.it
 - loop23@gmail.com
 executables: 
 - stress_reporter