ganymed 0.4.4 → 0.5.0

data/bin/ganymed

@@ -5,15 +5,27 @@ $:.unshift(File.join(File.expand_path("../..", __FILE__), 'lib'))
 
 $0 = "ganymed"
 
-require 'madvertise/ext/logging'
 require 'madvertise/ext/environment'
 Env.key = 'GANYMED_ENV'
 
+require 'madvertise-logging'
+$log = ImprovedLogger.new(:stdout, $0)
+
 require 'ganymed/master'
 cli = Ganymed::Master::CLI.parse_options
 server = Ganymed::Master.new(cli.config)
 
-log.level = :debug if cli.config[:debug]
+$log.level = :debug if cli.config[:debug]
+
+$config ||= Configuration.new do |config|
+  config.mixin(File.join(Ganymed::LIB_DIR, 'ganymed/config.yml'))
+  config.mixin(cli.config[:config_file]) if cli.config[:config_file]
+end
+
+if Env.prod?
+  Madvertise::Logging::ImprovedLogger::Formatter.
+    format = "<%{syslog_severity}>%{msg}\n"
+end
 
 if cli.config[:daemonize] or cli.config[:kill]
   daemon = Servolux::Daemon.new(:server => server)

data/ganymed.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   # master
   s.add_dependency "activesupport", ">= 3.2"
   s.add_dependency "eventmachine", ">= 0.12.10"
-  s.add_dependency "madvertise-ext", ">= 0.1.2"
-  s.add_dependency "madvertise-logging", ">= 0.3.2"
+  s.add_dependency "madvertise-ext", ">= 0.4.0"
+  s.add_dependency "madvertise-logging", ">= 1.0.0"
   s.add_dependency "mixlib-cli"
   s.add_dependency "servolux"
 

data/lib/ganymed/collector.rb

@@ -55,9 +55,9 @@ module Ganymed
         config = @config.collectors[name.to_sym] || Section.new
         config.name = name
 
-        log.debug("loading collector #{name} from #{file}")
+        $log.debug("loading collector #{name} from #{file}")
         Plugin.new(config).from_file(file).tap do |collector|
-          log.info("collecting #{name} metrics every #{collector.interval} seconds")
+          $log.info("collecting #{name} metrics every #{collector.interval} seconds")
           collector.run
         end
       end
@@ -70,7 +70,7 @@ module Ganymed
 
       [].tap do |files|
         load_paths.each do |load_path|
-          log.debug("loading collectors from #{load_path}")
+          $log.debug("loading collectors from #{load_path}")
           Dir[File.join(load_path, '*.rb')].each do |file|
             files << file
           end
@@ -130,8 +130,8 @@ module Ganymed
         @splay = 0
       rescue Exception => exc
         @splay += 1
-        log.exception(exc)
-        log.info("slowing down collector #{config.name}", interval: @interval, splay: @splay)
+        $log.exception(exc)
+        $log.info("slowing down collector #{config.name}", interval: @interval, splay: @splay)
       end
 
       # Loads a given ruby file, and runs instance_eval against it in the

data/lib/ganymed/config.yml

@@ -9,6 +9,9 @@ generic:
     gcprofiler: false
     rubyprof: false
 
+  collector:
+    load_paths: []
+
   collectors:
     network:
       exclude:

data/lib/ganymed/master.rb

@@ -13,74 +13,69 @@ require 'metriks/reporter/logger'
 module Ganymed
   # @private
   class Master < ::Servolux::Server
-    include Configuration::Helpers
 
     def initialize(cli)
-      # load config file
-      @default_config_file = File.join(LIB_DIR, 'ganymed/config.yml')
-      @config_file = cli[:config_file]
-
       # initialize servolux
       super('ganymed',
             :interval => 1,
-            :logger => log,
+            :logger => $log,
             :pid_file => cli[:pidfile])
     end
 
     def run
-      log.info("starting Ganymed reactor in #{Env.mode} mode")
+      $log.info("starting Ganymed reactor in #{Env.mode} mode")
 
       # configure eventmachine
-      log.debug("EventMachine threadpool_size=#{config.eventmachine.threadpool_size}")
-      EventMachine.threadpool_size = config.eventmachine.threadpool_size
+      $log.debug("EventMachine threadpool_size=#{$config.eventmachine.threadpool_size}")
+      EventMachine.threadpool_size = $config.eventmachine.threadpool_size
 
       EventMachine.epoll # use epoll
       EventMachine.run do
-        Collector.new(config) if config.collectors.any?
+        Collector.new($config) if $config.collectors.any?
         Metriks::Reporter::Logger.new({
-          :logger => log,
-          :interval => config.interval,
-          :on_error => ->(e) { log.exception(e) },
+          :logger => $log,
+          :interval => $config.interval,
+          :on_error => ->(e) { $log.exception(e) },
         }).start
       end
 
     rescue Exception => exc
-      log.exception(exc)
+      $log.exception(exc)
     end
 
     def before_starting
-      if config.profiling.perftools
-        log.info("activating PerfTools CPU profiler")
+      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")
+      if $config.profiling.gcprofiler
+        $log.info("activating GC::Profiler")
         GC::Profiler.enable
       end
 
-      if config.profiling.rubyprof
+      if $config.profiling.rubyprof
         require 'ruby-prof'
-        log.info("activating RubyProf")
+        $log.info("activating RubyProf")
         RubyProf.start
       end
     end
 
     def before_stopping
       if EventMachine.reactor_running?
-        log.info("shutting down Ganymed reactor")
+        $log.info("shutting down Ganymed reactor")
         EventMachine.stop_event_loop
       end
     end
 
     def after_stopping
-      if config.profiling.perftools
+      if $config.profiling.perftools
         PerfTools::CpuProfiler.stop
         `pprof.rb --svg profile > profile.svg`
       end
 
-      if config.profiling.rubyprof
+      if $config.profiling.rubyprof
         result = RubyProf.stop
         result.eliminate_methods!([
           /Queue#pop/,
@@ -92,7 +87,7 @@ module Ganymed
         printer.print(:path => "prof", :profile => "ganymed")
       end
 
-      log.info("done shutting down. exiting ...")
+      $log.info("done shutting down. exiting ...")
     end
 
     class CLI

data/lib/ganymed/version.rb

@@ -1,4 +1,4 @@
 module Ganymed
   # @private
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ganymed
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: madvertise-logging
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,6 @@ email:
 - bb@xnull.de
 executables:
 - ganymed
-- ganymed-console
 extensions: []
 extra_rdoc_files: []
 files:
@@ -189,7 +188,6 @@ files:
 - README.md
 - Rakefile
 - bin/ganymed
-- bin/ganymed-console
 - ganymed.gemspec
 - lib/ganymed.rb
 - lib/ganymed/collector.rb
@@ -222,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2160081704488403590
+      hash: 2008446248983856620
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -231,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2160081704488403590
+      hash: 2008446248983856620
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/bin/ganymed-console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-$:.unshift(File.join(File.expand_path("../..", __FILE__), 'lib'))
-
-$0 = "ganymed-console"
-
-require 'madvertise/ext/logging'
-require 'madvertise/ext/environment'
-Env.key = 'GANYMED_ENV'
-
-log.level = :debug
-
-require 'ganymed/console'
-Ganymed::Console.new