diff --git a/Gemfile.lock b/Gemfile.lock index c397e10c2a470c415babe7d60e0c41c180764a4c..beccedf92db0f5bfe24f70b3d1ec18b7f9b43ae2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -538,9 +538,3 @@ DEPENDENCIES web-console (>= 4.2.1) webdrivers webmock - -RUBY VERSION - ruby 3.0.0p0 - -BUNDLED WITH - 2.2.3 diff --git a/config/environments/production.rb b/config/environments/production.rb index 9e785e50979ff2b5eac35badf32c3a81b8c73843..9f91ad5db76a6ad09e0e84674e31d13c623dc0e3 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -135,17 +135,13 @@ Rails.application.configure do # require "syslog/logger" # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name") - if ENV['RAILS_LOG_TO_STDOUT'].present? - $stdout.sync = true - logger = ActiveSupport::Logger.new($stdout) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) - end - if ENV['RAILS_LOG_REMOTE_NAME'] && ENV['RAILS_LOG_REMOTE_PORT'] require 'remote_syslog_logger' logger_program = ENV['RAILS_LOG_REMOTE_TAG'] || "greenlight-v3-#{ENV.fetch('RAILS_ENV', nil)}" logger = RemoteSyslogLogger.new(ENV['RAILS_LOG_REMOTE_NAME'], ENV['RAILS_LOG_REMOTE_PORT'], program: logger_program) + else + $stdout.sync = true + logger = ActiveSupport::Logger.new($stdout) end logger.formatter = config.log_formatter diff --git a/config/initializers/active_model_serializers.rb b/config/initializers/active_model_serializers.rb new file mode 100644 index 0000000000000000000000000000000000000000..4b0fa5989010364e16a2d97882066715222f6fd6 --- /dev/null +++ b/config/initializers/active_model_serializers.rb @@ -0,0 +1,19 @@ +# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. +# +# Copyright (c) 2022 BigBlueButton Inc. and by respective authors (see below). +# +# This program is free software; you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free Software +# Foundation; either version 3.0 of the License, or (at your option) any later +# version. +# +# Greenlight is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License along +# with Greenlight; if not, see <http://www.gnu.org/licenses/>. + +# frozen_string_literal: true + +ActiveModelSerializers.logger = Logger.new(IO::NULL) if Rails.env.production?