diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-03-09 13:35:21 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-03-12 10:14:52 +0000 |
| commit | 68f8a798f24405318721a3457f2feb94452ba67b (patch) | |
| tree | 5d898ad7f86255d188533827b898c4dd81b5c92d | |
| parent | cd7fcfd5779716c302608ce462996809f952ceec (diff) | |
| download | gitlab-ce-allow-ee-in-backtraces.tar.gz | |
Include the ee/ directory in backtracesallow-ee-in-backtraces
| -rw-r--r-- | config/initializers/backtrace_silencers.rb | 9 | ||||
| -rw-r--r-- | lib/gitlab.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/profiler_spec.rb | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb index 59385cdf379..58941aae1b0 100644 --- a/config/initializers/backtrace_silencers.rb +++ b/config/initializers/backtrace_silencers.rb @@ -1,7 +1,2 @@ -# Be sure to restart your server when you modify this file. - -# 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! +Rails.backtrace_cleaner.remove_silencers! +Rails.backtrace_cleaner.add_silencer { |line| line !~ Gitlab::APP_DIRS_PATTERN } diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 11f7c8b9510..aa9fd36d9ff 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -2,6 +2,7 @@ require_dependency 'gitlab/git' module Gitlab COM_URL = 'https://gitlab.com'.freeze + APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))} def self.com? # Check `staging?` as well to keep parity with gitlab.com diff --git a/spec/lib/gitlab/profiler_spec.rb b/spec/lib/gitlab/profiler_spec.rb index f02b1cf55fb..3d5b56cd5b8 100644 --- a/spec/lib/gitlab/profiler_spec.rb +++ b/spec/lib/gitlab/profiler_spec.rb @@ -94,10 +94,12 @@ describe Gitlab::Profiler do it 'strips out the private token' do expect(custom_logger).to receive(:add) do |severity, _progname, message| + next if message.include?('spec/') + expect(severity).to eq(Logger::DEBUG) expect(message).to include('public').and include(described_class::FILTERED_STRING) expect(message).not_to include(private_token) - end + end.twice custom_logger.debug("public #{private_token}") end |