releaseable 0.0.14 → 0.0.15

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/releaseable/extensions.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require 'logglier'
 require 'stringio'
+require 'timeout'
 require 'java'
 
 # Selectively silence verbose JRuby warnings
@@ -43,23 +44,34 @@ class Logger
     self.class.sound_alarm beeps
   end
 
+  # Execute with timeout and protection from exceptions
+  def with_timeout out=5
+    Timeout::timeout(out) { yield }
+  rescue => e
+    nil
+  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]
+    if handler
+      with_timeout do
+        hash = error.is_a?(Hash) ? error : {:msg => error}
+        handler.add(hash[:severity] || Logger::UNKNOWN) do
+          hash.merge :tag => @config[:tag]
+        end
       end
     end
   end
 
   # Finalize logger
   def finalize
-    if @fatalities
-      trace :failsafe => @config[:failsafe].string if @config[:failsafe].respond_to? :string
-      sound_alarm
-      sleep 2
-      @fatalities.logdev.dev.deliverer.kill
+    if handler
+      with_timeout do
+        trace :failsafe => @config[:failsafe].string if @config[:failsafe].respond_to? :string
+        sound_alarm
+        sleep 2
+        handler.logdev.dev.deliverer.kill
+      end
     end
     close
   end
@@ -67,51 +79,66 @@ class Logger
   alias old_fatal fatal
 
   def fatal *args
-    if @fatalities
-      entry = args.first
-      case entry
-        when Exception
-          trace :severity => Logger::FATAL,
-                :error => entry.class,
-                :msg => entry.message,
-                :backtrace => (entry.backtrace || []).join(', ')
-        else
-          trace :severity => Logger::INFO, :msg => "#{args.join(', ')}"
-          old_fatal *args
+    if handler
+      with_timeout do
+        entry = args.first
+        case entry
+          when Exception
+            trace :severity => Logger::FATAL,
+                  :error => entry.class,
+                  :msg => entry.message,
+                  :backtrace => (entry.backtrace || []).join(', ')
+          else
+            trace :severity => Logger::INFO, :msg => "#{args.join(', ')}"
+            old_fatal *args
+        end
       end
     else
       old_fatal *args
     end
   end
 
-# Extended configuration for Logger
+  # Extended handler for fatal errors
+  def handler
+    return @handler if @handler
+
+    if @handle_fatal_errors
+      with_timeout do
+        # Something that should be interrupted if it takes too much time...
+        @handler = Logglier.new "#{@config[:domain]}/inputs/#{@config[:input]}",
+                                :failsafe => @config[:failsafe],
+                                :read_timeout => 10, # defaults to 120
+                                :open_timeout => 10, # defaults to 120
+                                :threaded => true,
+                                :format => :json
+      end
+    end
+  end
+
+  # 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[:time_format] ||= @config[:time] || '%H:%M:%S.%N'
+
+    @handle_fatal_errors = @config[:ignore] ? false : true
+
+    if @handle_fatal_errors
 
-    unless @config[:ignore] # fatal errors
       @config[:tag] = config[:tag] || config[:name] || !config[:connection] ? "Tag#{rand(10000)}" :
           "#{config[:env]}-#{config[:connection][:client_id]}-#{config[:connection][:account]}"
-      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[:domain] ||= 'https://logs.loggly.com'
       @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
+      @config[:input] = case @config[:input]
+                          when Symbol
+                            INPUTS[@config[:input]]
+                          when nil
+                            INPUTS[:opts]
+                          else
+                            @config[:input]
+                        end
     end
-
     self.level = @config[:level] || Logger::INFO
     self.formatter = formatter || proc do |level, time, prog, msg|
       "#{time.strftime(@config[:time_format])} #{msg}\n"

metadata

@@ -2,7 +2,7 @@
 name: releaseable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
   - arvicco
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-14 00:00:00 Z
+date: 2012-02-16 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bundler