hubrise_initializer 1.0.1 → 1.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d194962f743d2f8b6bff39108061f025f0cae54246db364f073b1deeaac2ba62
4
- data.tar.gz: f0febb9e3d615f8287c8b053e9f12190b4a07eb4990ede915f84d72851f67fd0
3
+ metadata.gz: 45fb130be84b2efa48bb2f12d55dd7cb6b8317024a499ef235d3147e5369ebd2
4
+ data.tar.gz: 2c10bf4fad684afbfd4ea1e46df5ede030d1280e815fa44f03a45fa73af67d92
5
5
  SHA512:
6
- metadata.gz: 6dba383db0c277229ae8fc7098c0c14fb0beb07f48d5b35f77acc1b6942f571d1150e7501aa3cc2f53dd9f6b6fa8c11924abc13a9745a17c216f2db822225700
7
- data.tar.gz: 837634d42cdf90e5c4655385cf8611c0868cbb14a14579bcc77ef4ab03d6eb6274c07f6c9c67d2d9eab9aa8b05814e1c9751e7463d8a7c913653cf31e1f2f81d
6
+ metadata.gz: 4ee262e8887201121d64dd34311aae1ab827fe57c99c4fc6d881ed9130d969f982fdaafbc9e9329aeca0b69d3802fcd955381cc67011f7ac1fa458346aad7cd4
7
+ data.tar.gz: e5d7f33383067d08b404e013b98ca3eb588a942e0eb57a8fd92b5d6e7db919e4fe1c679fa1df55b1c6fbc4012f5ced4fd9ea76549e82487f958c8bbc3960d1a5
data/Gemfile CHANGED
@@ -2,6 +2,7 @@
2
2
  source "https://rubygems.org"
3
3
 
4
4
  gem "rails", "~> 6.0"
5
+ gem "rspec"
5
6
  gem "rspec-rails", "~> 5.0"
6
7
  gem "hubrise_initializer", path: "."
7
8
 
data/Gemfile.lock CHANGED
@@ -1,12 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- hubrise_initializer (1.0.1)
4
+ hubrise_initializer (1.0.4)
5
5
  act-fluent-logger-rails (~> 0.6)
6
6
  lograge (~> 0.11)
7
7
  lograge-sql
8
8
  logstash-event (~> 1.2)
9
- rspec
10
9
 
11
10
  GEM
12
11
  remote: https://rubygems.org/
@@ -211,6 +210,7 @@ PLATFORMS
211
210
  DEPENDENCIES
212
211
  hubrise_initializer!
213
212
  rails (~> 6.0)
213
+ rspec
214
214
  rspec-rails (~> 5.0)
215
215
  rubocop (= 0.81.0)
216
216
  webmock
data/README.md CHANGED
@@ -11,7 +11,7 @@ gem 'hubrise_initializer'
11
11
 
12
12
  In `config/application.rb`:
13
13
  ```
14
- HubriseInitializer.configure(:logger, :delayed_job_logger, :web_console)
14
+ HubriseInitializer.configure(:logger, :web_console)
15
15
  ```
16
16
 
17
17
  ## Configuration
@@ -46,7 +46,9 @@ To upload the latest version to RubyGems.org:
46
46
 
47
47
  2. Tag the repository:
48
48
  ```bash
49
- VERSION=1.0.1
49
+ bundle install
50
+ VERSION=1.0.4
51
+ git add Gemfile.lock
50
52
  git add lib/hubrise_initializer/version.rb
51
53
  git commit -m "Version $VERSION"
52
54
  git tag v$VERSION
@@ -60,4 +62,5 @@ git push
60
62
  rm -f hubrise_initializer-*.gem
61
63
  gem build hubrise_initializer
62
64
  gem push hubrise_initializer-*.gem
65
+ rm -f hubrise_initializer-*.gem
63
66
  ```
@@ -21,5 +21,4 @@ Gem::Specification.new do |spec|
21
21
  spec.add_runtime_dependency("lograge-sql")
22
22
  spec.add_runtime_dependency("act-fluent-logger-rails", "~> 0.6")
23
23
  spec.add_runtime_dependency("logstash-event", "~> 1.2")
24
- spec.add_runtime_dependency("rspec")
25
24
  end
@@ -1,4 +1,6 @@
1
1
  # frozen_string_literal: true
2
+ require_relative "../hubrise_initializer"
3
+
2
4
  class HubriseInitializer
3
5
  class Lograge
4
6
  class << self
@@ -8,20 +10,19 @@ class HubriseInitializer
8
10
 
9
11
  def custom_payload(controller)
10
12
  request = controller.request
11
- request_headers = process_request_headers(request)
12
13
  response = controller.response
14
+ extra = controller.request.env[HubriseInitializer::LOGRAGE_INFO_ENV] || {}
13
15
 
14
16
  {
15
17
  release: ENV["RELEASE"],
16
18
  host: request.host,
17
19
  ip: request.ip,
18
- access_token: request_headers["X-Access-Token"], # For the API
19
20
  params: request.query_string.presence,
20
- }.compact
21
+ }.merge(extra)
21
22
  .merge(
22
23
  if ENV["RAILS_LOGRAGE_QUERY"] == "true"
23
24
  {
24
- request_headers: request_headers.to_s,
25
+ request_headers: process_request_headers(request).to_s,
25
26
  request_body: truncate_body(switch_to_utf8(request.raw_post)),
26
27
  response_headers: response.headers.to_h.to_s,
27
28
  response_body: truncate_body(switch_to_utf8(response.body)),
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  class HubriseInitializer
3
- VERSION = "1.0.1"
3
+ VERSION = "1.0.4"
4
4
  end
@@ -12,14 +12,16 @@ class HubriseInitializer
12
12
  case initializer
13
13
  when :logger
14
14
  configure_logger
15
- when :delayed_job_logger
16
- configure_delayed_job_logger
17
15
  when :web_console
18
16
  configure_web_console
19
17
  end
20
18
  end
21
19
  end
22
20
 
21
+ def lograge_info(controller, details)
22
+ (controller.request.env[LOGRAGE_INFO_ENV] ||= {}).merge!(details)
23
+ end
24
+
23
25
  private
24
26
 
25
27
  def configure_logger
@@ -56,23 +58,22 @@ class HubriseInitializer
56
58
  # Log to a file (Rails default)
57
59
  end
58
60
  end
61
+
62
+ if defined?(ActiveJob)
63
+ configure_active_job_logger
64
+ end
59
65
  end
60
66
 
61
- def configure_delayed_job_logger
67
+ def configure_active_job_logger
62
68
  Rails.application.configure do
63
- Delayed::Worker.logger = case ENV["RAILS_LOGGER"]
64
- when "stdout"
65
- # Log to STDOUT (docker-compose)
69
+ ActiveJob::Base.logger = case ENV["RAILS_LOGGER"]
70
+ when "stdout", "fluentd"
71
+ # Do not send ActiveJobs logs to fluentd as this would create new Elasticsearch entries detached from the
72
+ # request.
66
73
  ActiveSupport::Logger.new(STDOUT)
67
74
 
68
- when "fluentd"
69
- # Log to fluentd (kubernetes)
70
- # ENV['FLUENTD_URL'] is used internally by this logger
71
- ActFluentLoggerRails::Logger.new
72
-
73
75
  else
74
- # Log to a file
75
- ActiveSupport::Logger.new(File.join(Rails.root, "log", "delayed_job.log"))
76
+ ActiveSupport::Logger.new(File.join(Rails.root, "log", "active_job.log"))
76
77
  end
77
78
  end
78
79
  end
@@ -89,4 +90,6 @@ class HubriseInitializer
89
90
  end
90
91
  end
91
92
  end
93
+
94
+ LOGRAGE_INFO_ENV = "rails-initializer-lograge-info"
92
95
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hubrise_initializer
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Antoine Monnier
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-07-19 00:00:00.000000000 Z
11
+ date: 2022-07-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: lograge
@@ -66,20 +66,6 @@ dependencies:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1.2'
69
- - !ruby/object:Gem::Dependency
70
- name: rspec
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- version: '0'
76
- type: :runtime
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ">="
81
- - !ruby/object:Gem::Version
82
- version: '0'
83
69
  description:
84
70
  email:
85
71
  executables: []