log_weasel 0.0.2 → 0.0.3

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
 .bundle
 pkg/*
+.idea

data/Gemfile.lock

@@ -1,13 +1,17 @@
 PATH
   remote: .
   specs:
-    log_weasel (0.0.2)
+    log_weasel (0.0.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.4)
+    builder (3.0.0)
     diff-lcs (1.1.2)
+    hoptoad_notifier (2.4.5)
+      activesupport
+      builder
     json (1.4.6)
     mocha (0.9.11)
       rake
@@ -41,6 +45,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 3.0)
+  hoptoad_notifier
   log_weasel!
   mocha
   resque (~> 1.0)

data/Rakefile

@@ -9,3 +9,5 @@ Bundler::GemHelper.install_tasks
 Rspec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
 end
+
+task :default => [:spec]

data/lib/log_weasel/buffered_logger.rb

@@ -0,0 +1,15 @@
+require 'active_support/buffered_logger'
+
+class LogWeasel::BufferedLogger < ::ActiveSupport::BufferedLogger
+  def add(severity, message = nil, progname = nil, &block)
+    super(severity, "[#{LogWeasel::Transaction.id}] #$$: #{format_severity(severity)} #{message}", progname, &block)
+  end
+
+  private
+  # Severity label for logging. (max 5 char)
+  SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY)
+
+  def format_severity(severity)
+    SEV_LABEL[severity] || 'ANY'
+  end
+end

data/lib/log_weasel/hoptoad_notifier.rb

@@ -0,0 +1,23 @@
+module LogWeasel::HoptoadNotifier
+  def notify_with_transaction_id(exception, opts = {})
+    add_transaction_id(opts) if LogWeasel::Transaction.id
+    notify_without_transaction_id exception, opts
+  end
+
+  def notify_or_ignore_with_transaction_id(exception, opts = {})
+    add_transaction_id(opts) if LogWeasel::Transaction.id
+    notify_or_ignore_without_transaction_id exception, opts
+  end
+
+  def add_transaction_id(opts)
+    opts[:parameters]                           ||= {}
+    opts[:parameters]['log_weasel_id'] = LogWeasel::Transaction.id
+  end
+
+  def self.included(base)
+    base.send :alias_method, :notify_without_transaction_id, :notify
+    base.send :alias_method, :notify, :notify_with_transaction_id
+    base.send :alias_method, :notify_or_ignore_without_transaction_id, :notify_or_ignore
+    base.send :alias_method, :notify_or_ignore, :notify_or_ignore_with_transaction_id
+  end
+end

data/lib/log_weasel/middleware.rb

@@ -0,0 +1,13 @@
+class LogWeasel::Middleware
+  def initialize(app, options = {})
+    @app = app
+    @key = options[:key] || 'RAILS'
+  end
+
+  def call(env)
+    LogWeasel::Transaction.create "#{@key}-WEB"
+    @app.call(env)
+  ensure
+    LogWeasel::Transaction.destroy
+  end
+end

data/lib/log_weasel/resque.rb

@@ -0,0 +1,67 @@
+module LogWeasel::Resque
+
+  def self.initialize!(key)
+    ::Resque::Worker.send(:include, LogWeasel::Resque::Worker)
+    ::Resque::Job.send(:include, LogWeasel::Resque::Job)
+    ::Resque.extend(LogWeasel::Resque::ClassMethods)
+
+    ::Resque.after_fork do |job|
+      LogWeasel::Resque::Callbacks.after_fork job, key
+    end
+
+    ::Resque.before_push do |queue, item|
+      LogWeasel::Resque::Callbacks.before_push queue, item, key
+    end
+  end
+
+  module Callbacks
+    def self.after_fork(job, key)
+      if job.context && job.context.has_key?('log_weasel_id')
+        LogWeasel::Transaction.id = job.context['log_weasel_id']
+      else
+        LogWeasel::Transaction.create "#{key}-RESQUE"
+      end
+    end
+
+    def self.before_push(queue, item, key)
+      item['context'] = {'log_weasel_id' => (LogWeasel::Transaction.id || LogWeasel::Transaction.create("#{key}-RESQUE"))}
+    end
+  end
+
+  module ClassMethods
+    def before_push(&block)
+      block ? (@before_push = block) : @before_push
+    end
+
+    def push(queue, item)
+      self.before_push.call(queue, item) if self.before_push
+      super
+    end
+  end
+
+  module Job
+    def context
+      @payload['context']
+    end
+
+    def inspect_with_context
+      inspect_without_context.gsub /\)$/, " | #{context.inspect})"
+    end
+
+    def self.included(base)
+      base.send :alias_method, :inspect_without_context, :inspect
+      base.send :alias_method, :inspect, :inspect_with_context
+    end
+  end
+
+  module Worker
+    def log_with_transaction_id(message)
+      log_without_transaction_id "[#{LogWeasel::Transaction.id}] #{message}"
+    end
+
+    def self.included(base)
+      base.send :alias_method, :log_without_transaction_id, :log
+      base.send :alias_method, :log, :log_with_transaction_id
+    end
+  end
+end

data/lib/log_weasel/transaction.rb

@@ -2,19 +2,19 @@ module LogWeasel
   module Transaction
 
     def self.create(key = nil)
-      Thread.current[:manilla_transaction_id] = "#{key ? "#{key}_" : ""}#{SecureRandom.hex(10)}"
+      Thread.current[:log_weasel_id] = "#{key ? "#{key}_" : ""}#{SecureRandom.hex(10)}"
     end
 
     def self.destroy
-      Thread.current[:manilla_transaction_id] = nil
+      Thread.current[:log_weasel_id] = nil
     end
 
     def self.id=(id)
-      Thread.current[:manilla_transaction_id] = id
+      Thread.current[:log_weasel_id] = id
     end
 
     def self.id
-      Thread.current[:manilla_transaction_id]
+      Thread.current[:log_weasel_id]
     end
   end
   

data/lib/log_weasel/version.rb

@@ -1,5 +1,5 @@
 module Log
   module Weasel
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/log_weasel.rb

@@ -1 +1,9 @@
 require 'log_weasel/transaction'
+require 'log_weasel/buffered_logger'
+require 'log_weasel/hoptoad_notifier'
+require 'log_weasel/middleware'
+require 'log_weasel/resque'
+
+class << ::HoptoadNotifier
+  include LogWeasel::HoptoadNotifier;
+end if defined? ::HoptoadNotifier

data/log_weasel.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('mocha')
   s.add_development_dependency('resque', ['~> 1.0'])
   s.add_development_dependency('activesupport', ['~> 3.0'])
+  s.add_development_dependency('hoptoad_notifier',)
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/log_weasel/buffered_logger_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'log_weasel/buffered_logger'
+
+describe LogWeasel::BufferedLogger do
+  before do
+    @stringio = StringIO.new
+    @logger   = LogWeasel::BufferedLogger.new @stringio
+    LogWeasel::Transaction.stubs(:id).returns('123')
+  end
+
+  it "logs transaction id" do
+    @logger.info 'message'
+    @stringio.string.should =~ /\[123\]/
+  end
+end

data/spec/log_weasel/hoptoad_notifier_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'hoptoad_notifier'
+require 'log_weasel/hoptoad_notifier'
+
+describe LogWeasel::HoptoadNotifier do
+  before do
+    class << ::HoptoadNotifier
+      include LogWeasel::HoptoadNotifier;
+    end if defined? ::HoptoadNotifier
+
+    HoptoadNotifier.configure {}
+    LogWeasel::Transaction.stubs(:id).returns('123')
+  end
+
+  it "adds transaction id to parameters with no parameters" do
+    HoptoadNotifier.expects(:send_notice).with do |notice|
+      notice.parameters.should have_key('log_weasel_id')
+    end
+    HoptoadNotifier.notify(RuntimeError.new('failure'))
+  end
+
+end

data/spec/log_weasel/resque_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'resque'
+require 'log_weasel/resque'
+
+describe LogWeasel::Resque do
+
+  before do
+    LogWeasel::Resque.initialize! 'FOO'
+  end
+  
+  after do
+    LogWeasel::Transaction.destroy
+  end
+
+  it "pushes with log_weasel_id in context" do
+    Resque.stubs(:redis).returns(stub(:sadd => nil, :rpush => nil))
+    Resque.expects(:encode).with do |item|
+      item['context'].should_not be_nil
+      item['context'].should have_key('log_weasel_id')
+      item['context']['log_weasel_id'].should =~ /^FOO-RESQUE/
+    end
+    Resque.push('queue', {'args' => [1]})
+  end
+
+  describe ".after_fork" do
+    context "with log_weasel_id" do
+      before do
+        @job = Resque::Job.new 'queue', {'args' =>[{}], 'context' => {'log_weasel_id' => "123"}}
+      end
+
+      it "sets transaction id from args" do
+        LogWeasel::Transaction.expects(:id=).with('123')
+        LogWeasel::Resque::Callbacks.after_fork @job, nil
+      end
+    end
+
+    context "without log_weasel_id" do
+      before do
+        @job = Resque::Job.new 'queue', {'args' =>[1]}
+      end
+
+      it "creates a new log_weasel_id" do
+        LogWeasel::Transaction.expects(:create)
+        LogWeasel::Resque::Callbacks.after_fork @job, nil
+      end
+    end
+  end
+end

data/spec/log_weasel/transaction_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'active_support'
-require 'active_support/secure_random'
 
 describe LogWeasel::Transaction do
 

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'log_weasel'
+require 'log_weasel/transaction'
 require 'rspec'
 
+require 'active_support/secure_random'
+
 Rspec.configure do |config|
   config.mock_with :mocha
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alon Salant
@@ -71,6 +71,19 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hoptoad_notifier
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: Instrument Rails and Resque with shared transaction IDs so that you trace execution across instances.
 email: 
 - alon@salant.org
@@ -89,9 +102,16 @@ files:
 - README.md
 - Rakefile
 - lib/log_weasel.rb
+- lib/log_weasel/buffered_logger.rb
+- lib/log_weasel/hoptoad_notifier.rb
+- lib/log_weasel/middleware.rb
+- lib/log_weasel/resque.rb
 - lib/log_weasel/transaction.rb
 - lib/log_weasel/version.rb
 - log_weasel.gemspec
+- spec/log_weasel/buffered_logger_spec.rb
+- spec/log_weasel/hoptoad_notifier_spec.rb
+- spec/log_weasel/resque_spec.rb
 - spec/log_weasel/transaction_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -108,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1874627953720402256
+      hash: -3932380171388894158
       segments: 
       - 0
       version: "0"
@@ -117,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1874627953720402256
+      hash: -3932380171388894158
       segments: 
       - 0
       version: "0"
@@ -127,7 +147,10 @@ rubyforge_project: log_weasel
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: log_weasel-0.0.2
+summary: log_weasel-0.0.3
 test_files: 
+- spec/log_weasel/buffered_logger_spec.rb
+- spec/log_weasel/hoptoad_notifier_spec.rb
+- spec/log_weasel/resque_spec.rb
 - spec/log_weasel/transaction_spec.rb
 - spec/spec_helper.rb