diff --git a/Gemfile b/Gemfile index 44926ad75..d6bef4cbe 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,6 @@ gem 'rmagick', :require => "RMagick" gem 'daemons' gem 'net-ssh' gem 'net-sftp' -gem 'sys-proctable', :require => "sys/proctable" group :development do gem 'newrelic_rpm' diff --git a/Gemfile.lock b/Gemfile.lock index 51aca6bb2..e9b62f7a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,7 +159,6 @@ GEM super_exception_notifier (3.0.13) actionmailer rake - sys-proctable (0.9.2) therubyracer (0.11.3) libv8 (~> 3.11.8.12) ref @@ -208,7 +207,6 @@ DEPENDENCIES simple_form simplecov super_exception_notifier - sys-proctable therubyracer uglifier (>= 1.0.3) whenever diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6e014b35e..49c8c48d4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -6,15 +6,11 @@ class ApplicationController < ActionController::Base before_filter :initialize_cookies before_filter :set_title before_filter :set_started_at_session - after_filter :log_memory_usage layout "default" rescue_from User::PrivilegeError, :with => :access_denied protected - def log_memory_usage - Rails.logger.info "\e[1;31mMemory usage:\e[0m #{Memorylogic.memory_usage}\t\e[1;31mParams:\e[0m #{params.inspect}\t\e[1;31mUser: \e[0m#{CurrentUser.id}" - end def access_denied previous_url = params[:url] || request.fullpath diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 2b7f56cdf..e7b15eb48 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -14,7 +14,7 @@ class CommentsController < ApplicationController end def search - @search = Comment.search(params[:search]) + # @search = Comment.search(params[:search]) end def update diff --git a/app/controllers/dmails_controller.rb b/app/controllers/dmails_controller.rb index 07191436c..971bcd1b7 100644 --- a/app/controllers/dmails_controller.rb +++ b/app/controllers/dmails_controller.rb @@ -20,8 +20,7 @@ class DmailsController < ApplicationController end def search - @search = Dmail.search(params[:search]) - respond_with(@dmails) + # @search = Dmail.search(params[:search]) end def show diff --git a/app/controllers/forum_posts_controller.rb b/app/controllers/forum_posts_controller.rb index d9d4d8c39..eb20b3c80 100644 --- a/app/controllers/forum_posts_controller.rb +++ b/app/controllers/forum_posts_controller.rb @@ -22,7 +22,7 @@ class ForumPostsController < ApplicationController end def search - @search = ForumPost.search(params[:search]) + # @search = ForumPost.search(params[:search]) end def show diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 7f70bf4ab..6e45b0a13 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -4,7 +4,7 @@ class NotesController < ApplicationController before_filter :pass_html_id, :only => [:create] def search - @search = Note.search(params[:search]) + # @search = Note.search(params[:search]) end def index diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb index cb43bd1f0..7333ca6a6 100644 --- a/app/controllers/pools_controller.rb +++ b/app/controllers/pools_controller.rb @@ -21,7 +21,7 @@ class PoolsController < ApplicationController end def search - @search = Pool.search(params[:search]) + # @search = Pool.search(params[:search]) end def show diff --git a/app/controllers/post_versions_controller.rb b/app/controllers/post_versions_controller.rb index ff3dd7af9..fc04fbeb4 100644 --- a/app/controllers/post_versions_controller.rb +++ b/app/controllers/post_versions_controller.rb @@ -8,6 +8,6 @@ class PostVersionsController < ApplicationController end def search - @search = PostVersion.search(params[:search]) + # @search = PostVersion.search(params[:search]) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 98d01dc14..b11f96c60 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -21,7 +21,7 @@ class UsersController < ApplicationController end def search - @search = User.search(params[:search]) + # @search = User.search(params[:search]) end def show diff --git a/app/logical/memorylogic.rb b/app/logical/memorylogic.rb deleted file mode 100644 index b2c8f8b45..000000000 --- a/app/logical/memorylogic.rb +++ /dev/null @@ -1,14 +0,0 @@ -module Memorylogic - class << self - include ActionView::Helpers::NumberHelper - end - - def self.memory_usage - ps = Sys::ProcTable.ps(Process.pid) - if ps.respond_to?(:pctmem) - ps.pctmem - else - 0 - end - end -end diff --git a/config/initializers/memory_logic.rb b/config/initializers/memory_logic.rb deleted file mode 100644 index 53bedad5f..000000000 --- a/config/initializers/memory_logic.rb +++ /dev/null @@ -1,8 +0,0 @@ -ActiveSupport::BufferedLogger.class_eval do - def add_with_memory_info(severity, message = nil, progname = nil, &block) - str = "\t\e[1;31mMemory usage:\e[0m #{Memorylogic.memory_usage}" - add_without_memory_info(severity, message + str, progname, &block) - end - - alias_method_chain :add, :memory_info -end \ No newline at end of file