Merge branch 'allow-ee-in-backtraces' into 'master'
Include the ee/ directory in backtraces Closes gitlab-ee#5204 See merge request gitlab-org/gitlab-ce!17664
This commit is contained in:
commit
ff292d40a2
|
@ -1,7 +1,2 @@
|
||||||
# Be sure to restart your server when you modify this file.
|
Rails.backtrace_cleaner.remove_silencers!
|
||||||
|
Rails.backtrace_cleaner.add_silencer { |line| line !~ Gitlab::APP_DIRS_PATTERN }
|
||||||
# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
|
|
||||||
# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
|
|
||||||
|
|
||||||
# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
|
|
||||||
# Rails.backtrace_cleaner.remove_silencers!
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ require_dependency 'gitlab/git'
|
||||||
|
|
||||||
module Gitlab
|
module Gitlab
|
||||||
COM_URL = 'https://gitlab.com'.freeze
|
COM_URL = 'https://gitlab.com'.freeze
|
||||||
|
APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
|
||||||
|
|
||||||
def self.com?
|
def self.com?
|
||||||
# Check `staging?` as well to keep parity with gitlab.com
|
# Check `staging?` as well to keep parity with gitlab.com
|
||||||
|
|
|
@ -94,10 +94,12 @@ describe Gitlab::Profiler do
|
||||||
|
|
||||||
it 'strips out the private token' do
|
it 'strips out the private token' do
|
||||||
expect(custom_logger).to receive(:add) do |severity, _progname, message|
|
expect(custom_logger).to receive(:add) do |severity, _progname, message|
|
||||||
|
next if message.include?('spec/')
|
||||||
|
|
||||||
expect(severity).to eq(Logger::DEBUG)
|
expect(severity).to eq(Logger::DEBUG)
|
||||||
expect(message).to include('public').and include(described_class::FILTERED_STRING)
|
expect(message).to include('public').and include(described_class::FILTERED_STRING)
|
||||||
expect(message).not_to include(private_token)
|
expect(message).not_to include(private_token)
|
||||||
end
|
end.twice
|
||||||
|
|
||||||
custom_logger.debug("public #{private_token}")
|
custom_logger.debug("public #{private_token}")
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue