Skip to content

Commit 4eefd85

Browse files
author
Suszyński Krzysztof
committed
Better logger
1 parent 55c1ada commit 4eefd85

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

lib/puppet_forge_server/logger.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717

1818
require 'logger'
19+
require 'logger/colors'
1920

2021
module PuppetForgeServer
2122
class Logger
@@ -45,7 +46,13 @@ def method_missing (method_name, *args, &block)
4546
else
4647
method_name
4748
end
48-
@loggers.each { |logger| logger.send(method_name, args.first) }
49+
if args.size > 0
50+
# setters
51+
@loggers.each { |logger| logger.send(method_name, args.first) }
52+
else
53+
# getters
54+
@loggers.collect { |logger| logger.send(method_name) }
55+
end
4956
end
5057

5158
def respond_to?(method_name, include_private = false)
@@ -70,4 +77,4 @@ def set(loggers= {})
7077
end
7178
end
7279
end
73-
end
80+
end

puppet-forge-server.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Gem::Specification.new do |spec|
4747
spec.add_dependency 'redcarpet', '~> 3.3.0'
4848
spec.add_dependency 'lrucache', '~> 0.1.4'
4949
spec.add_dependency 'iconv', '~> 1.0.4'
50+
spec.add_dependency 'logger-colors', '~> 1.0'
5051

5152
spec.add_development_dependency 'rake', '~> 10.3'
5253
spec.add_development_dependency 'rspec', '~> 3.1'

spec/unit/http/http_client_spec.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@
2929
socket.close
3030
end
3131
end
32+
@original_level = PuppetForgeServer::Logger.get.level.first
33+
PuppetForgeServer::Logger.get.level = Logger::WARN
3234
end
3335
after(:each) do
3436
@server.close
3537
@thr.kill
38+
PuppetForgeServer::Logger.get.level = @original_level
3639
end
3740
let(:instance) { described_class.new(cache) }
3841
describe '#download' do

0 commit comments

Comments
 (0)