From 42ce59d2576e0a9f349a7a1d9b2c12eaec1abc62 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 1 Jul 2016 01:21:40 +0800 Subject: [PATCH] Partially revert https://github.com/discourse/discourse/commit/09b92dd3. --- config/initializers/006-mini_profiler.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/initializers/006-mini_profiler.rb b/config/initializers/006-mini_profiler.rb index c8ab968581c..e39b1a33dee 100644 --- a/config/initializers/006-mini_profiler.rb +++ b/config/initializers/006-mini_profiler.rb @@ -2,7 +2,12 @@ if Rails.configuration.respond_to?(:load_mini_profiler) && Rails.configuration.load_mini_profiler require 'rack-mini-profiler' require 'flamegraph' - require 'memory_profiler' + + begin + require 'memory_profiler' + rescue => e + STDERR.put "#{e} failed to require mini profiler" + end # initialization is skipped so trigger it Rack::MiniProfilerRails.initialize!(Rails.application)