Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ build-iPhoneSimulator/

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# rubocop
.rubocop-https---raw-githubusercontent-com-Invoca-style-guide-master-ruby--rubocop-yml
5 changes: 5 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This rubocop config file inherits from our centralized style-guide repository.
# If you are looking to update the ruby style guide, be sure to both update the rubocop config
# as well as the README.md
# https://github.com/Invoca/style-guide/tree/master/ruby
inherit_from: https://raw.githubusercontent.com/Invoca/style-guide/master/ruby/.rubocop.yml
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

source 'http://rubygems.org'

gemspec
Expand Down
2 changes: 2 additions & 0 deletions contextual_logger.gemspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

Gem::Specification.new do |spec|
spec.name = 'contextual_logger'
spec.version = '0.1.0'
Expand Down
5 changes: 2 additions & 3 deletions lib/contextual_logger.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string literal: true
# frozen_string_literal: true

require 'json'

Expand Down Expand Up @@ -59,7 +59,7 @@ def unknown(progname = nil, **extra_context, &block)

def add(severity, message = nil, progname = nil, extra_context = nil)
severity ||= UNKNOWN
if @logdev.nil? or severity < @level
if @logdev.nil? || (severity < @level)
return true
end
progname ||= @progname
Expand All @@ -79,7 +79,6 @@ def write_entry_to_log(severity, timestamp, progname, message, context)
@logdev.write(format_message(format_severity(severity), timestamp, progname, message, context))
end


private

THREAD_CONTEXT_NAMESPACE = 'ContextualLoggerCurrentLoggingContext'
Expand Down
10 changes: 4 additions & 6 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,15 @@

class Time
class << self
def now_override= override_time
@@now_override = override_time
end
attr_writer :now_override

def now_override
@@now_override ||= nil
@now_override ||= nil
end

unless defined? @@_old_now_defined
unless defined? @_old_now_defined
alias old_now now
@@_old_now_defined = true
@_old_now_defined = true
end
end

Expand Down