Skip to content
Open
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
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ gem 'puma', '~> 8.0'
gem 'rack_content_type_default', '~> 1.1'
gem 'rack-cors'
gem 'rails', '~> 8.1.3'
gem 'rails_semantic_logger', '~> 4.20'
gem 'ruby-progressbar', '~> 1.13', require: false
gem 'ruby-vips'
gem 'rubyzip'
Expand Down
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,10 @@ GEM
rails-html-sanitizer (1.7.0)
loofah (~> 2.25)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails_semantic_logger (4.20.0)
rack
railties (>= 5.1)
semantic_logger (~> 4.16)
railties (8.1.3)
actionpack (= 8.1.3)
activesupport (= 8.1.3)
Expand Down Expand Up @@ -513,6 +517,8 @@ GEM
childprocess (>= 0.5, < 5.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2)
semantic_logger (4.18.0)
concurrent-ruby (~> 1.0)
sentry-rails (6.6.0)
railties (>= 5.2.0)
sentry-ruby (~> 6.6.0)
Expand Down Expand Up @@ -618,6 +624,7 @@ DEPENDENCIES
rack_content_type_default (~> 1.1)
rails (~> 8.1.3)
rails-erd
rails_semantic_logger (~> 4.20)
rspec
rspec-rails
rspec_junit_formatter
Expand Down
3 changes: 3 additions & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,8 @@ class Application < Rails::Application

config.x.cloudflare_turnstile.secret_key = ENV.fetch('CLOUDFLARE_TURNSTILE_SECRET_KEY', nil)
config.x.cloudflare_turnstile.enabled = ENV['CLOUDFLARE_TURNSTILE_SECRET_KEY'].present?

config.rails_semantic_logger.format = :json
config.semantic_logger.application = 'editor-api'
end
end
11 changes: 7 additions & 4 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,13 @@
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true

# Log to STDOUT by default
config.logger = ActiveSupport::Logger.new($stdout)
.tap { |logger| logger.formatter = Logger::Formatter.new }
.then { |logger| ActiveSupport::TaggedLogging.new(logger) }
# Log to STDOUT on Heroku in JSON format, where this variable is set automatically.
if ENV['RAILS_LOG_TO_STDOUT'].present?
$stdout.sync = true
config.rails_semantic_logger.add_file_appender = false
config.semantic_logger.add_appender(io: $stdout, formatter: :json)
config.semantic_logger.application = "editor-api@#{ENV['HEROKU_SLUG_COMMIT'] || 'unknown'}"
end

# Prepend all log lines with the following tags.
config.log_tags = [:request_id]
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/flipper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# config.flipper.strict = Rails.env.development? && :warn

## Show Flipper checks in logs
# config.flipper.log = true
config.flipper.log = false

## Reconfigure Flipper to use the Memory adapter and disable Cloud in tests
# config.flipper.test_help = true
Expand Down
5 changes: 5 additions & 0 deletions config/puma.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@

workers worker_count

before_worker_boot do
# Re-open appenders after forking the process
SemanticLogger.reopen
end

Comment thread
mwtrew marked this conversation as resolved.
# Use the `preload_app!` method when specifying a `workers` number.
# This directive tells Puma to first boot the application and load code
# before forking the application. This takes advantage of Copy On Write
Expand Down
Loading