cellumon 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393429643d51ab62509e289d26e26b6ff9525392
-  data.tar.gz: 317bf1a9f1481c17ff687e0d3fabb08e6e3a2776
+  metadata.gz: f2e3b257f2c4f10d56674d661d5e534c572c6755
+  data.tar.gz: 3c533c0a6582739f4c50fe96bce8b477abf2549c
 SHA512:
-  metadata.gz: 2e46df51abd66e48a5835ab8af203edf580f9a82a93f0bc857bc341dc113d24f21119aa942a76aa29510eb3ddb0e75f8a6dd585345674e7d42fce354e0bbf216
-  data.tar.gz: 9703a1b0387a1a90ecf06175bdb691f2ddea703aa88aa22e02e54a655185283716224f8528f75e7b02bab76252fa0dcfe9128a79b5699597f32b37ffbdf1aef6
+  metadata.gz: ea2715476ada07a49f5448994981cd792c62df2bad7a053c22bbd37ab2cb90f5892eedda38b97ab9af600325d5d52dd8f5e6aafd71db5fe7c4a42fd5a940a9d8
+  data.tar.gz: 24b3c12802773a090a17f64e66736ea4732d1a2cb00bdcca7fdda983c1d558319049cd5e3669da65536756d4f545e211bef0bdf25e7d0f1c752f435bc0139127

data/cellumon.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name         = "cellumon"
-  gem.version      = "0.3.0"
+  gem.version      = "0.4.0"
   gem.platform     = Gem::Platform::RUBY
   gem.summary      = "Monitor threads, processes, and states of Celluloid and its Actor System."
   gem.description  = "Thread summary and reporting actor, utility for finding leaks and monitoring."

data/lib/cellumon.rb

@@ -6,29 +6,47 @@ class Cellumon
   include Celluloid
 
   class << self
-    def start!(name=:cellumon)
-      Cellumon.supervise(as: name)
-      Celluloid[:cellumon]
+    def start!(options={})
+      name = options.delete(:name) || :cellumon
+      unless options.fetch(:monitors, nil).is_a? Array
+        puts "Cellumon > No monitors specified"
+        return
+      end
+      Cellumon.supervise(as: name, args: [options])
+      Celluloid[name]
     end
   end
 
   MONITORS = {
     thread_survey: 30,
     thread_report: 15,
-    thread_summary: 1,
-    memory_count: 13
+    thread_summary: 3,
+    memory_count: 13,
+    threads_and_memory: 45
   }
 
-  def initialize(mark=false)
+  def initialize(options={})
     @semaphor = {}
     @status = {}
     @timers = {}
-    @mark = mark
+    @debug = options.fetch(:debug, false)
+    @logger = options.fetch(:logger, nil)
+    @mark = options.fetch(:mark, false)
     @intervals = MONITORS.dup
+    @options = options
+    async.start
   end
 
-  def mark
-    @mark ? "Cellumon > " : ""
+  def start
+    if @options[:monitors].is_a?(Array)
+      debug("Monitors:") if @debug
+      @options[:monitors].each { |monitor|
+        debug("* #{monitor} every #{MONITORS[monitor]} seconds.") if @debug
+        send("start_#{monitor}!")
+      }
+    else
+      debug("No preconfigured monitors.") if @debug
+    end
   end
 
   MONITORS.each { |m,i|
@@ -50,74 +68,103 @@ class Cellumon
   }
     
   def memory_count!
-    if ready? :memory_count
-      total = `pmap #{Process.pid} | tail -1`[10,40].strip[0..-1]
-      console("Memory usage: #{memory(total)}")
-      ready! :memory_count
-    end    
-    @timers[:memory_count] = after(@intervals[:memory_count]) { memory_count! }
-  end
-
-  def memory(total)
-    total = total.to_i
-    gb = (total / (1024 * 1024)).to_i
-    mb = total % gb
-    "#{'%0.2f' % "#{gb}.#{mb}"}gb" #de Very fuzzy math but fine for now.
+    trigger!(:memory_count) { console memory }
   end
 
   def thread_survey!
-    if ready? :thread_survey
-      Celluloid.stack_summary
-      ready! :thread_survey
-    end
-    @timers[:thread_survey] = after(@intervals[:thread_survey]) { thread_survey! }
+    trigger!(:thread_survey) { Celluloid.stack_summary }
   end
 
   def thread_summary!
-    if ready? :thread_summary
-      print " #{Thread.list.count} "
-      ready! :thread_summary
-    end
-    @timers[:thread_summary] = after(@intervals[:thread_summary]) { thread_summary! }
+    trigger!(:thread_summary) { print " #{Thread.list.count} " }
   end
 
   def thread_report!
-    if ready? :thread_report
-      threads = Thread.list.inject({}) { |l,t| l[t.object_id] = t.status; l }
-      r = threads.select { |id,status| status == 'run' }.count
-      s = threads.select { |id,status| status == 'sleep' }.count
-      a = threads.select { |id,status| status == 'aborting' }.count
-      nt = threads.select { |id,status| status === false }.count
-      te = threads.select { |id,status| status.nil? }.count
-      console "Threads #{threads.count}: #{r}r #{s}s #{a}a #{nt}nt #{te}te"
-      ready! :thread_report
-    end
-    @timers[:thread_report] = after(@intervals[:thread_report]) { thread_report! }
+    trigger!(:thread_report) { console threads }
   end
 
-  def console(message)
-    puts "*, [#{Time.now.strftime('%FT%T.%L')}] #{mark}#{message}"
+  def threads_and_memory!
+    trigger!(:threads_and_memory) { console "#{threads}; #{memory}" }
   end
 
   private
 
-  def ready! monitor
-    @semaphor[monitor].synchronize { @status[monitor] = :ready }
+  def threads
+    threads = Thread.list.inject({}) { |l,t| l[t.object_id] = t.status; l }
+    r = threads.select { |id,status| status == 'run' }.count
+    s = threads.select { |id,status| status == 'sleep' }.count
+    a = threads.select { |id,status| status == 'aborting' }.count
+    nt = threads.select { |id,status| status === false }.count
+    te = threads.select { |id,status| status.nil? }.count
+    "Threads #{threads.count}: #{r}r #{s}s #{a}a #{nt}nt #{te}te"
   end
 
-  def running! monitor
-    @semaphor[monitor].synchronize { @status[monitor] = :running }
+  def memory
+    total = `pmap #{Process.pid} | tail -1`[10,40].strip[0..-1].to_i
+    gb = (total / (1024 * 1024)).to_i
+    mb = total % gb
+    "Memory: #{'%0.2f' % "#{gb}.#{mb}"}gb" #de Very fuzzy math but fine for now.
+  end
+
+  def console(message, options={})
+    if @logger
+      @logger.console(message, options.merge(reporter: "Cellumon"))
+    else
+      plain_output("#{mark}#{message}")
+    end
+  rescue
+    plain_output("#{mark}#{message}")
   end
 
-  def stopped! monitor
-    @semaphor[monitor].synchronize { @status[monitor] = :stopped }
+  def debug(message)
+    console(message, level: :debug)
   end
 
-  def ready? monitor
-    @semaphor[monitor].synchronize { @status[monitor] == :ready }
+  def exception(ex, message)
+    if @logger
+      @logger.exception(ex, message)
+    else
+      plain_output("(#{ex.class}) #{ex.message}: #{message}")
+    end
+  rescue
+    plain_output("(#{ex.class}) #{ex.message}: #{message}")
+  ensure
+    plain_output("(#{ex.class}) #{ex.message}: #{message}")
+  end
+
+  def trigger!(monitor)
+    puts "trigger: #{monitor}" if @debug
+    if ready?(monitor)
+      result = yield
+      ready! monitor
+    end
+    @timers[monitor].cancel rescue nil
+    @timers[monitor] = after(@intervals[monitor]) { send("#{monitor}!") }
+    result
+  rescue => ex
+    exception(ex, "Cellumon > Failure to trigger: #{monitor}")
+  end
+
+  def mark
+    @mark ? "Cellumon > " : ""
+  end
+
+  [:ready, :running, :stopped].each { |state|
+    define_method("#{state}!") { |monitor|
+      @semaphor[monitor].synchronize { @status[monitor] = state }
+    }
+    define_method("#{state}?") { |monitor|
+      @semaphor[monitor].synchronize { @status[monitor] == state }
+    }
+  }
+
+  def plain_output(message)
+    message = "*, [#{Time.now.strftime('%FT%T.%L')}] #{mark}#{message}"
+    STDERR.puts message
+    STDOUT.puts message
   end
 
-  def output object
+  def pretty_output object
     puts JSON.pretty_generate(object)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellumon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - digitalextremist //
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies: []
 description: Thread summary and reporting actor, utility for finding leaks and monitoring.
 email: