releaseable 0.0.4 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.6

data/lib/releaseable/extensions.rb

@@ -2,14 +2,34 @@ require 'logger'
 require 'logglier'
 require 'java'
 
+# Selectively silence verbose JRuby warnings
+def suppress_all_warnings
+  old_verbose = $VERBOSE
+  begin
+    $VERBOSE = nil
+    yield if block_given?
+  ensure
+    # always re-set to old value, even if block raises an exception
+    $VERBOSE = old_verbose
+  end
+end
+
 # Avoid OpenSSL failures
-OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+suppress_all_warnings do
+  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+end
 
 # Logger extensions
 class Logger
 
+  INPUTS = {:default => 'c568432d-8f50-4b12-9322-5f6ffda7883b',
+            :opts => 'b9a22025-b148-4dfe-8355-ce5dba40b6a2',
+            :json => '62a8ef41-fd80-460f-a6f7-e45f232dd1d8',
+            :aux => '207f124e-9de6-434f-b100-af1ac3585089', }
+
   attr_accessor :config
 
+  # Alarm sound to get my attention
   def self.sound_alarm beeps = 3
     beeps.times do
       java.awt.Toolkit.getDefaultToolkit.beep
@@ -17,33 +37,57 @@ class Logger
     end
   end
 
+  # Alarm sound on Logger instance
   def sound_alarm beeps = @config[:beeps]
     self.class.sound_alarm beeps
   end
 
   alias old_fatal fatal
 
+  # Extended handler for fatal errors
   def fatal *args
     if @config && @config[:fatal]
       entry = args.first
       case entry
         when Exception
-          @config[:fatal].fatal "#{entry.class}: '#{entry.message}' at #{caller.join(', ')}"
+          @config[:fatal].fatal :tag => @config[:tag],
+                                :error => entry.class,
+                                :msg => entry.message,
+                                :backtrace => entry.backtrace.join(', ')
         else
-          @config[:fatal].info *args
+          @config[:fatal].info :tag => @config[:tag],
+                               :msg => "#{args.join(', ')}"
+          old_fatal *args
       end
+    else
+      old_fatal *args
     end
-    old_fatal *args
   end
 
-  def configure config, &formatter
-    @config = config.dup
+  # Extended configuration for Logger
+  def configure config={}, &formatter
+    @config = (config[:log] || config).dup
     @config[:beeps] ||= 0
     @config[:time_format] ||= @config[:time] || '%M:%S.%N'
-    @config[:input] ||= 'b9a22025-b148-4dfe-8355-ce5dba40b6a2' #non-default
-    @config[:domain] ||= 'logs.loggly.com'
-    unless @config[:ignore]
-      @config[:fatal] ||= Logglier.new "https://#{@config[:domain]}/inputs/#{@config[:input]}"
+
+    unless @config[:ignore] # fatal errors
+      @config[:progname] = config[:progname] || ''
+      @config[:tag] = config[:tag] || config[:name] || config[:connection] && config[:env] ?
+          "#{config[:env]}#{config[:connection][:client_id]}" : "Tag#{rand(10000)}"
+      input = case @config[:input]
+                when Symbol
+                  INPUTS[@config[:input]]
+                when nil
+                  INPUTS[:opts]
+                else
+                  @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
     end
 
     self.level = @config[:level] || Logger::INFO
@@ -52,20 +96,3 @@ class Logger
     end
   end
 end
-
-# Object#raise extensions
-
-alias old_raise raise
-
-# Sound alarm before raising error
-def raise error
-  ex = error.kind_of?(String) ? RuntimeError.new(error) : error.exception
-
-  if defined?(log) && log.config
-    log.sound_alarm
-    log.fatal ex
-  else
-    Logger.sound_alarm
-  end
-  old_raise ex #, ex.message, caller #ex.backtrace
-end

metadata

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