api_hammer 0.5.0 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +3 -0
- data/lib/api_hammer/faraday/request_logger.rb +1 -8
- data/lib/api_hammer/rails_or_sidekiq_logger.rb +43 -0
- data/lib/api_hammer/version.rb +1 -1
- data/lib/api_hammer.rb +19 -4
- data/test/faraday_request_logger_test.rb +0 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ce63ff50e3e052b9baa6a9f6f6c45e9a5a7f2ed5
|
4
|
+
data.tar.gz: 7f0e9b25392ce4a3e8ee142fba08046c6162915b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6e34d35e48b004a332d754bf4ca95b41841ba2aba0a4071e4f583b4d311855f045d7444fc5e30a91fa751cf7aefb1e245289be6932bd283cb2bba0aba04058aa
|
7
|
+
data.tar.gz: e3763513e988b90137f7160a023faf59ebe03f1a84d37ae148da4aa7cb988c8716b4c14a01e4469317dcec4daa9eb0082aa1722cf836c071c0ca75c9b2c56e0a
|
data/CHANGELOG.md
CHANGED
@@ -4,13 +4,6 @@ require 'term/ansicolor'
|
|
4
4
|
require 'json'
|
5
5
|
require 'strscan'
|
6
6
|
|
7
|
-
if Faraday.respond_to?(:register_middleware)
|
8
|
-
Faraday.register_middleware(:request, :api_hammer_request_logger => proc { ApiHammer::Faraday::RequestLogger })
|
9
|
-
end
|
10
|
-
if Faraday::Request.respond_to?(:register_middleware)
|
11
|
-
Faraday::Request.register_middleware(:api_hammer_request_logger => proc { ApiHammer::Faraday::RequestLogger })
|
12
|
-
end
|
13
|
-
|
14
7
|
module ApiHammer
|
15
8
|
# parses attributes out of content type header
|
16
9
|
class ContentTypeAttrs
|
@@ -51,7 +44,7 @@ module ApiHammer
|
|
51
44
|
end
|
52
45
|
end
|
53
46
|
|
54
|
-
|
47
|
+
module Faraday
|
55
48
|
# Faraday middleware for logging.
|
56
49
|
#
|
57
50
|
# two lines:
|
@@ -0,0 +1,43 @@
|
|
1
|
+
module ApiHammer
|
2
|
+
# switch a logger between Rails.logger and sidekiq's logger
|
3
|
+
#
|
4
|
+
# Sidekiq.configure_server do |config|
|
5
|
+
# ...
|
6
|
+
#
|
7
|
+
# config.server_middleware do |chain|
|
8
|
+
# chain.add ApiHammer::RailsOrSidekiqLoggerMiddleware
|
9
|
+
# end
|
10
|
+
# end
|
11
|
+
class RailsOrSidekiqLoggerMiddleware
|
12
|
+
def call(worker, msg, queue, &block)
|
13
|
+
ApiHammer::RailsOrSidekiqLogger.with_logger(worker.logger, &block)
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
# include in a class to define #logger which will switch between Sidekiq and Rails
|
18
|
+
# using RailsOrSidekiqLoggerMiddleware
|
19
|
+
#
|
20
|
+
# class Foo
|
21
|
+
# include ApiHammer::RailsOrSidekiqLogger
|
22
|
+
# end
|
23
|
+
#
|
24
|
+
module RailsOrSidekiqLogger
|
25
|
+
LOGGER_KEY = 'api_hammer_rails_or_sidekiq_logger'
|
26
|
+
def with_logger(logger)
|
27
|
+
orig_logger = Thread.current[LOGGER_KEY]
|
28
|
+
begin
|
29
|
+
Thread.current[LOGGER_KEY] = logger
|
30
|
+
yield
|
31
|
+
ensure
|
32
|
+
Thread.current[LOGGER_KEY] = orig_logger
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
def logger
|
37
|
+
logger = Thread.current[LOGGER_KEY] || ::Rails.logger
|
38
|
+
logger.respond_to?(:tagged) ? logger : ::ActiveSupport::TaggedLogging.new(logger)
|
39
|
+
end
|
40
|
+
|
41
|
+
extend self
|
42
|
+
end
|
43
|
+
end
|
data/lib/api_hammer/version.rb
CHANGED
data/lib/api_hammer.rb
CHANGED
@@ -2,8 +2,23 @@ require 'api_hammer/version'
|
|
2
2
|
|
3
3
|
module ApiHammer
|
4
4
|
autoload :Rails, 'api_hammer/rails'
|
5
|
-
autoload :RequestLogger, 'api_hammer/request_logger
|
6
|
-
autoload :ShowTextExceptions, 'api_hammer/show_text_exceptions
|
7
|
-
autoload :TrailingNewline, 'api_hammer/trailing_newline
|
8
|
-
autoload :Weblink, 'api_hammer/weblink
|
5
|
+
autoload :RequestLogger, 'api_hammer/request_logger'
|
6
|
+
autoload :ShowTextExceptions, 'api_hammer/show_text_exceptions'
|
7
|
+
autoload :TrailingNewline, 'api_hammer/trailing_newline'
|
8
|
+
autoload :Weblink, 'api_hammer/weblink'
|
9
|
+
autoload :RailsOrSidekiqLoggerMiddleware, 'api_hammer/rails_or_sidekiq_logger'
|
10
|
+
autoload :RailsOrSidekiqLogger, 'api_hammer/rails_or_sidekiq_logger'
|
11
|
+
autoload :FaradayOutputter, 'api_hammer/faraday/outputter'
|
12
|
+
autoload :FaradayCurlVOutputter, 'api_hammer/faraday/outputter'
|
13
|
+
module Faraday
|
14
|
+
autoload :RequestLogger, 'api_hammer/faraday/request_logger'
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
require 'faraday'
|
19
|
+
if Faraday.respond_to?(:register_middleware)
|
20
|
+
Faraday.register_middleware(:request, :api_hammer_request_logger => proc { ApiHammer::Faraday::RequestLogger })
|
21
|
+
end
|
22
|
+
if Faraday::Request.respond_to?(:register_middleware)
|
23
|
+
Faraday::Request.register_middleware(:api_hammer_request_logger => proc { ApiHammer::Faraday::RequestLogger })
|
9
24
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: api_hammer
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ethan
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-08-
|
11
|
+
date: 2014-08-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rack
|
@@ -244,6 +244,7 @@ files:
|
|
244
244
|
- lib/api_hammer/halt.rb
|
245
245
|
- lib/api_hammer/public_instance_exec.rb
|
246
246
|
- lib/api_hammer/rails.rb
|
247
|
+
- lib/api_hammer/rails_or_sidekiq_logger.rb
|
247
248
|
- lib/api_hammer/rails_request_logging.rb
|
248
249
|
- lib/api_hammer/request_logger.rb
|
249
250
|
- lib/api_hammer/show_text_exceptions.rb
|