releaseable 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/releaseable/extensions.rb

@@ -1,9 +1,10 @@
 require 'logger'
 require 'logglier'
+require 'stringio'
 require 'java'
 
 # Selectively silence verbose JRuby warnings
-def suppress_all_warnings
+def suppress_warnings
   old_verbose = $VERBOSE
   begin
     $VERBOSE = nil
@@ -15,7 +16,7 @@ def suppress_all_warnings
 end
 
 # Avoid OpenSSL failures
-suppress_all_warnings do
+suppress_warnings do
   OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 end
 
@@ -27,7 +28,7 @@ class Logger
             :json => '62a8ef41-fd80-460f-a6f7-e45f232dd1d8',
             :aux => '207f124e-9de6-434f-b100-af1ac3585089', }
 
-  attr_accessor :config
+  attr_accessor :config, :logdev
 
   # Alarm sound to get my attention
   def self.sound_alarm beeps = 3
@@ -42,21 +43,39 @@ class Logger
     self.class.sound_alarm beeps
   end
 
+  # Trace errors in json format
+  def trace error
+    if @fatalities
+      hash = error.is_a?(Hash) ? error : {:msg => error}
+      @fatalities.add(hash[:severity] || Logger::UNKNOWN) do
+        hash.merge :tag => @config[:tag]
+      end
+    end
+  end
+
+  # Finalize logger
+  def finalize
+    if @fatalities
+      trace :failsafe => @config[:failsafe].string if @config[:failsafe].respond_to? :string
+      sleep 1
+      @fatalities.logdev.dev.deliverer.kill
+    end
+    close
+  end
+
   alias old_fatal fatal
 
-  # Extended handler for fatal errors
   def fatal *args
-    if @config && @config[:fatal]
+    if @fatalities
       entry = args.first
       case entry
         when Exception
-          @config[:fatal].fatal :tag => @config[:tag],
-                                :error => entry.class,
-                                :msg => entry.message,
-                                :backtrace => entry.backtrace.join(', ')
+          trace :severity => Logger::FATAL,
+                :error => entry.class,
+                :msg => entry.message,
+                :backtrace => (entry.backtrace || []).join(', ')
         else
-          @config[:fatal].info :tag => @config[:tag],
-                               :msg => "#{args.join(', ')}"
+          trace :severity => Logger::INFO, :msg => "#{args.join(', ')}"
           old_fatal *args
       end
     else
@@ -64,7 +83,7 @@ class Logger
     end
   end
 
-  # Extended configuration for Logger
+# Extended configuration for Logger
   def configure config={}, &formatter
     @config = (config[:log] || config).dup
     @config[:beeps] ||= 0
@@ -82,11 +101,14 @@ class Logger
                   @config[:input]
               end
       domain ||= @config[:domain] || 'https://logs.loggly.com'
-      @config[:fatal] ||= Logglier.new "#{domain}/inputs/#{input}",
-                                       :read_timeout => 3,
-                                       :open_timeout => 3,
-                                       :threaded => true,
-                                       :format => :json
+      @config[:failsafe] ||= StringIO.new("") # $stderr
+
+      @fatalities ||= Logglier.new "#{domain}/inputs/#{input}",
+                                   :failsafe => @config[:failsafe],
+                                   :read_timeout => 10, # defaults to 120
+                                   :open_timeout => 10, # defaults to 120
+                                   :threaded => true,
+                                   :format => :json
     end
 
     self.level = @config[:level] || Logger::INFO
@@ -94,4 +116,5 @@ class Logger
       "#{time.strftime(@config[:time_format])} #{msg}\n"
     end
   end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: releaseable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
   - arvicco
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-29 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bundler