errlog 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e34622fa375c0d03a9146d8c33a2c0de3800d6c
-  data.tar.gz: c5b0c688c78cb5bc0d69377c7d80f52dcba770be
+  metadata.gz: d90364c90b687b6ecaa2bcf73018f281eff1aaff
+  data.tar.gz: ec8ebdc1660cdbd7ad5d2542da2652785d76c6cf
 SHA512:
-  metadata.gz: 9a24d4280575e54d3bb551e5cb485b14507c49f6ef13496cab175b64dc962589f623d4888c8c396f88b781271d1216674c899145b52bbfa05f5bbb57b4e4f4cc
-  data.tar.gz: 2515dcbef0f0a7cd3bc42d703c3b1129abd3cb2f06c54b4842324341612b3c4adae16be27e81227cf5fc22f24bb0809af105b94f2eab4a561128a5015d82bc6a
+  metadata.gz: 8b62f8568e4cd90b0bd8cc73d1139d0f7f4e8b1751a03483119f5a95f39832107bc08b53407504b162f7c0c383f32494bfbc6d5de002d109b1c36dca102f0555
+  data.tar.gz: a4e69d69a7b12f6486a1730ef464466b79dd9d13ebb9c332b35681c206f570d44316db8e8c745c468ef57ddca67c076349c750942b4c9e85bb4d75edde9a1dad

data/.gitignore

@@ -17,4 +17,5 @@ test/tmp
 test/version_tmp
 tmp
 .idea
-.rbx
+.rbx
+.errlog.yml

data/bin/errlogr

@@ -30,6 +30,10 @@ Parameters
   -a appname
     set the application name. 'default' if not set.
 
+  -t test package
+    This mode allows developer to test the packed data. Pass your packed in base64 form instead of the
+    text and you will either see the unpacked data or an error message.
+
 Some/all of there parameters might be set in the .errlog.yml file in the current path
 or down the tree. Command-line parameters override these from configuration file.
 
@@ -51,20 +55,22 @@ end
 usage if ARGV.length == 0
 
 key, id, text, host, app, platform = nil, nil, '', nil, nil, nil
-severity = 100
+severity                           = 100
+
+test_mode = false
 
 begin
   n = 0
   while n < ARGV.length do
     arg = ARGV[n]
-    n += 1
+    n   += 1
     case arg
       when '-k'
         key = ARGV[n]
-        n += 1
+        n   += 1
       when '-i'
         id = ARGV[n]
-        n += 1
+        n  += 1
       when /^--local/
         host = "http://localhost:8080"
       when /^--warn/
@@ -73,10 +79,12 @@ begin
         severity = Errlog::TRACE
       when '-a'
         app = ARGV[n]
-        n += 1
+        n   += 1
       when '-p'
         platform = ARGV[n]
-        n += 1
+        n        += 1
+      when '-t'
+        test_mode = true
       else
         text = arg.strip
         break
@@ -99,10 +107,10 @@ if !key || !id
     error "Neither id/key or configuration file was found"
     usage
   end
-  cfg = OpenStruct.new YAML::load_file(cfile)
-  id ||= cfg.account_id
-  key ||= cfg.account_key
-  app ||= cfg.application
+  cfg      = OpenStruct.new YAML::load_file(cfile)
+  id       ||= cfg.account_id
+  key      ||= cfg.account_key
+  app      ||= cfg.application
   platform ||= cfg.platform
 end
 
@@ -113,12 +121,21 @@ end
 
 usage if !key || !id || text.length == 0
 
-Errlog.configure id, key, {host: host}
-Errlog.context.platform = platform
+Errlog.configure id, key, { host: host }
+Errlog.context.platform    = platform
 Errlog.context.application = app
 
-Errlog.report text, severity do |error|
-  STDERR.puts "Error: #{error}".red if error
-  exit error ? 10 : 0
+if test_mode
+  packager              = Errlog.default_packager
+  packager.throw_errors = true
+  puts "Decoded valid errlog package: \n#{packager.unpack(Base64.decode64(text)).inspect}"
+  exit 0
 end
-Errlog.wait
+
+Errlog.report text, severity
+if Errlog.wait
+  STDERR.puts "Error sending the report".red
+  exit 10
+end
+
+exit 0

data/lib/errlog.rb

@@ -41,6 +41,7 @@ module Errlog
   end
 
   @@configured = false
+  @@send_error = false
 
   # Configure your instance. Sbhould be called before any other methods. Follow http://errorlog.co/help/rails
   # to get your credentials
@@ -118,6 +119,10 @@ module Errlog
     @@packager.pack(data)
   end
 
+  def self.default_packager
+    @@packager
+  end
+
   def self.protect component_name=nil, options={}, &block
     context.protect component_name, options, &block
   end
@@ -156,6 +161,12 @@ module Errlog
     Thread.current[:errlog_context] || clear_context
   end
 
+  def self.wait
+    @@send_threads.each { |t| t.weakref_alive? and t.join }
+    @@send_threads == []
+    @@send_error
+  end
+
   private
 
   def self.post src
@@ -175,19 +186,14 @@ module Errlog
         error = "report refused: #{res.status}" if res.status != 200
       rescue Exception => e
         error = e
+        @@send_error = error
       end
       STDERR.puts "Error sending errlog: #{error}" if error
-      #puts "sent" unless error
       yield error if block_given?
     }
     @@send_threads << WeakRef.new(t)
   end
 
-  def self.wait
-    @@send_threads.each { |t| t.weakref_alive? and t.join }
-    @@send_threads == []
-  end
-
 end
 
 if defined?(Rails) && Rails.env == 'test'

data/lib/errlog/packager.rb

@@ -12,9 +12,14 @@ module Errlog
   # transfer the report over the network. Normally you don't use it directly.
   class Packager
 
-    def initialize app_id, app_key
+    attr_accessor :throw_errors
+
+    class Exception < Exception; end;
+
+    def initialize app_id, app_key, throw_errors = false
       @appid = app_id
       @key   = app_key.length == 16 ? app_key : Base64.decode64(app_key)
+      @throw_errors = throw_errors
     end
 
     # AES-128 encrypt the block
@@ -57,14 +62,18 @@ module Errlog
           data = block[1...-32]
           sign = block[-32..-1]
           if sign != Digest::SHA256.digest(data + @key)
+            puts "Sign does not match"
+            @throw_errors and raise Exception, "Wrong signature"
             nil
           else
             JSON.parse Zlib::GzipReader.new(StringIO.new(data)).read
           end
         else
+          @throw_errors and raise Exception, "Unknown block type: #{block[0].ord}"
           nil
       end
     rescue
+      @throw_errors and raise
       nil
     end
 

data/lib/errlog/version.rb

@@ -1,3 +1,3 @@
 module Errlog
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: errlog
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boss-protocol