IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 08:57:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

update memory profiler, oj and lru redux

Browse Source
This commit is contained in:
Sam Saffron 2015-06-05 01:03:11 +10:00
parent fb7baeb7a2
commit 9b489506d0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@ -148,11 +148,11 @@ GEM
libv8 (3.16.14.7)
listen (0.7.3)
logster (0.8.1)
lru_redux (0.8.4)
lru_redux (1.1.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
memory_profiler (0.9.0)
memory_profiler (0.9.3)
message_bus (1.0.12)
rack (>= 1.1.3)
redis
@ -182,7 +182,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
oj (2.12.0)
oj (2.12.9)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)

7
config/initializers/06-mini_profiler.rb
View File

@ -3,8 +3,11 @@ if Rails.configuration.respond_to?(:load_mini_profiler) && Rails.configuration.l
require 'rack-mini-profiler'
require 'flamegraph'
# TODO support Ruby 2.2 once bundler fixes itself
require 'memory_profiler' if RUBY_VERSION >= "2.1.0" && RUBY_VERSION < "2.2.0"
begin
require 'memory_profiler' if RUBY_VERSION >= "2.1.0"
rescue => e
STDERR.put "#{e} failed to require mini profiler"
end
# initialization is skipped so trigger it
Rack::MiniProfilerRails.initialize!(Rails.application)