warcorrespondent 0.2.6 → 0.2.7

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 warcorrespondent.gemspec
+main.rb

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/bin/warcorrespondent

@@ -14,14 +14,8 @@ if !WarCorrespondent::config_file
   exit
 end
 
-if WarCorrespondent::config_file
-  Daemons.run_proc('warcorrespondent.rb') do
-    WarCorrespondent::setup
-    WarCorrespondent::run
-  end
-else
-  puts "Could not find config file although it should have been installed."
-  puts "Maybe you should try it manually, see documentation."
-  puts "I'm bailing out now..."
+Daemons.run_proc('warcorrespondent', {
+  :dir_mode => :system
+}) do
+  WarCorrespondent::run
 end
-

data/lib/warcorrespondent/logging.rb

@@ -0,0 +1,20 @@
+require 'logger'
+require 'singleton'
+module WarCorrespondent 
+  class WLogger  < Logger
+    include Singleton
+    def initialize
+      super(WarCorrespondent::log_file,10, 10_000_000)
+    end
+  end
+
+  module Logging
+    def self.logger
+      @logger_instance ||= WLogger.instance
+    end
+    def logger
+      self.logger
+    end
+  end
+
+end

data/lib/warcorrespondent/reporter.rb

@@ -17,6 +17,7 @@ module WarCorrespondent
 
     def update
       data = instance_eval(&@block)
+      return if data == nil
       data = [data] if data.class == Hash
       data.map! do |e|
         e = {:timestamp => Time.now.to_i}.merge(e)
@@ -25,6 +26,8 @@ module WarCorrespondent
         e
       end
       WarCorrespondent::update(data)
+    rescue e
+      Logging::logger.warn{e}
     end
 
     def run

data/lib/warcorrespondent.rb

@@ -1,3 +1,4 @@
+require 'warcorrespondent/logging.rb'
 require 'warcorrespondent/reporter.rb'
 require 'warcorrespondent/uplink.rb'
 require 'warcorrespondent/installer.rb'
@@ -6,7 +7,6 @@ require 'systeminformation'
 require 'yaml'
 
 module WarCorrespondent
-
   def self.config_base_directory
     [ '/etc/warcorrespondent', '~/.warcorrespondent'].each do |f|
       if File.exists?(File.expand_path(f))
@@ -23,6 +23,10 @@ module WarCorrespondent
   def self.reporters_directory
     config_base_directory+"/reporters" if config_base_directory
   end
+  
+  def self.log_file
+    '/var/log/warcorrespondent'
+  end
 
   def self.setup
     @@reporters ||= []
@@ -32,19 +36,24 @@ module WarCorrespondent
       @@uplink.url = @@config['url']
       @@uplink.secret = @@config['secret']
     rescue
-      raise "Could not load config file #{config_file}"
+      Logging::logger.fatal "Could not load config file #{config_file}. Bailing out."
       exit
     end
     Dir.glob("#{reporters_directory}/*.rb").each do |i| 
       begin
+        Logging::logger.info "including #{i}"
         require i 
       rescue
-        puts "Parse error in #{i}. Bailing out."
+        Logging::logger.fatal "Parse error in #{i}. Bailing out."
       end
     end
   end
   
   def self.run
+    pp self.methods
+    Logging::logger.info{'warcorrespondent starting up'}
+    setup
+    Logging::logger.debug "config loaded..."
     Thread.new do 
       @@uplink.run
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Stefan Maier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 +02:00
+date: 2010-06-21 00:00:00 +02:00
 default_executable: warcorrespondent
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - dev
 - lib/warcorrespondent.rb
 - lib/warcorrespondent/installer.rb
+- lib/warcorrespondent/logging.rb
 - lib/warcorrespondent/reporter.rb
 - lib/warcorrespondent/reporters/cpu.rb
 - lib/warcorrespondent/reporters/loadavg.rb