ganymed 0.3.0 → 0.3.1

data/lib/ganymed/collectors/cpu.rb

@@ -1,5 +1,5 @@
 collect do
-  break if not File.readable?('/proc/stat')
+  next if not File.readable?('/proc/stat')
 
   File.open('/proc/stat') do | file|
     file.each do |line|

data/lib/ganymed/collectors/network.rb

@@ -4,7 +4,7 @@ Struct.new("NetworkStat", :dev,
            :wbytes, :wpackets, :werrs, :wdrop, :wfifo, :wcolls, :wcarrier, :wcompressed)
 
 collect do
-  break if not File.readable?('/proc/net/dev')
+  next if not File.readable?('/proc/net/dev')
 
   File.open('/proc/net/dev') do |file|
     file.each do |line|

data/lib/ganymed/collectors/process.rb

@@ -1,5 +1,5 @@
 collect do
-  break if not File.readable?('/proc/stat')
+  next if not File.readable?('/proc/stat')
   File.open('/proc/stat') do |file|
     file.each do |line|
       key, value = line.chomp.split

data/lib/ganymed/collectors/uptime.rb

@@ -1,5 +1,5 @@
 collect do
-  break if not File.readable?('/proc/stat')
+  next if not File.readable?('/proc/stat')
   File.open('/proc/stat') do |file|
     file.each do |line|
       next if not line =~ /^btime /

data/lib/ganymed/master.rb

@@ -31,15 +31,6 @@ module Ganymed
     end
 
     def run
-      if pid = Process.fork
-        @supervisor = true
-        Process.wait(pid)
-      else
-        child
-      end
-    end
-
-    def child
       log.info("starting Ganymed reactor in #{Env.mode} mode")
 
       # configure eventmachine
@@ -57,23 +48,21 @@ module Ganymed
     end
 
     def before_starting
-      unless @supervisor
-        if config.profiling.perftools
-          log.info("activating PerfTools CPU profiler")
-          require 'perftools'
-          PerfTools::CpuProfiler.start('profile')
-        end
+      if config.profiling.perftools
+        log.info("activating PerfTools CPU profiler")
+        require 'perftools'
+        PerfTools::CpuProfiler.start('profile')
+      end
 
-        if config.profiling.gcprofiler
-          log.info("activating GC::Profiler")
-          GC::Profiler.enable
-        end
+      if config.profiling.gcprofiler
+        log.info("activating GC::Profiler")
+        GC::Profiler.enable
+      end
 
-        if config.profiling.rubyprof
-          require 'ruby-prof'
-          log.info("activating RubyProf")
-          RubyProf.start
-        end
+      if config.profiling.rubyprof
+        require 'ruby-prof'
+        log.info("activating RubyProf")
+        RubyProf.start
       end
     end
 
@@ -85,23 +74,21 @@ module Ganymed
     end
 
     def after_stopping
-      unless @supervisor
-        if config.profiling.perftools
-          PerfTools::CpuProfiler.stop
-          `pprof.rb --svg profile > profile.svg`
-        end
+      if config.profiling.perftools
+        PerfTools::CpuProfiler.stop
+        `pprof.rb --svg profile > profile.svg`
+      end
 
-        if config.profiling.rubyprof
-          result = RubyProf.stop
-          result.eliminate_methods!([
-            /Queue#pop/,
-            /Queue#push/,
-            /Mutex#synchronize/,
-            /Mutex#sleep/,
-          ])
-          printer = RubyProf::MultiPrinter.new(result)
-          printer.print(:path => "prof", :profile => "ganymed")
-        end
+      if config.profiling.rubyprof
+        result = RubyProf.stop
+        result.eliminate_methods!([
+          /Queue#pop/,
+          /Queue#push/,
+          /Mutex#synchronize/,
+          /Mutex#sleep/,
+        ])
+        printer = RubyProf::MultiPrinter.new(result)
+        printer.print(:path => "prof", :profile => "ganymed")
       end
 
       log.info("done shutting down. exiting ...")

data/lib/ganymed/mongodb.rb

@@ -14,8 +14,8 @@ module Ganymed
     def connection
       @connection ||= ::Mongo::Connection.new(config.host,
                                               config.port,
-                                              :pool_size => 5,
-                                              :pool_timeout => 5)
+                                              :pool_size => config.pool_size,
+                                              :pool_timeout => config.pool_timeout)
     end
 
     def db

data/lib/ganymed/version.rb

@@ -1,4 +1,4 @@
 module Ganymed
   # @private
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ganymed
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &16400780 !ruby/object:Gem::Requirement
+  requirement: &7558920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *16400780
+  version_requirements: *7558920
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &16399280 !ruby/object:Gem::Requirement
+  requirement: &7557220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *16399280
+  version_requirements: *7557220
 - !ruby/object:Gem::Dependency
   name: ganymed-client
-  requirement: &16397660 !ruby/object:Gem::Requirement
+  requirement: &7555900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *16397660
+  version_requirements: *7555900
 - !ruby/object:Gem::Dependency
   name: madvertise-ext
-  requirement: &16396540 !ruby/object:Gem::Requirement
+  requirement: &7554720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *16396540
+  version_requirements: *7554720
 - !ruby/object:Gem::Dependency
   name: madvertise-logging
-  requirement: &16395360 !ruby/object:Gem::Requirement
+  requirement: &7553740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *16395360
+  version_requirements: *7553740
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &16394880 !ruby/object:Gem::Requirement
+  requirement: &7553220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16394880
+  version_requirements: *7553220
 - !ruby/object:Gem::Dependency
   name: RubyInline
-  requirement: &16410420 !ruby/object:Gem::Requirement
+  requirement: &7567900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16410420
+  version_requirements: *7567900
 - !ruby/object:Gem::Dependency
   name: servolux
-  requirement: &16408420 !ruby/object:Gem::Requirement
+  requirement: &7566640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16408420
+  version_requirements: *7566640
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &16406820 !ruby/object:Gem::Requirement
+  requirement: &7564920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16406820
+  version_requirements: *7564920
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &16405220 !ruby/object:Gem::Requirement
+  requirement: &7562960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *16405220
+  version_requirements: *7562960
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &16403660 !ruby/object:Gem::Requirement
+  requirement: &7561620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16403660
+  version_requirements: *7561620
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &16402580 !ruby/object:Gem::Requirement
+  requirement: &7592340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16402580
+  version_requirements: *7592340
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
-  requirement: &16433420 !ruby/object:Gem::Requirement
+  requirement: &7591700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16433420
+  version_requirements: *7591700
 - !ruby/object:Gem::Dependency
   name: ohai
-  requirement: &16432680 !ruby/object:Gem::Requirement
+  requirement: &7590960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: 0.6.12
   type: :runtime
   prerelease: false
-  version_requirements: *16432680
+  version_requirements: *7590960
 description: Ganymed is an event collection daemon
 email:
 - bb@xnull.de
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4174202345634086766
+      hash: -4196854861267997123
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4174202345634086766
+      hash: -4196854861267997123
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17