From 48d4673935c38659f4ac6fc392ff30f58ed5f8e6 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Sun, 17 Feb 2013 17:50:00 -0500
Subject: [PATCH] add memorylogic

---
 Gemfile                                   | 2 --
 app/controllers/application_controller.rb | 8 +++++++-
 app/logical/memorylogic.rb                | 9 +++++++++
 config/application.rb                     | 1 +
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 app/logical/memorylogic.rb

diff --git a/Gemfile b/Gemfile
index 6c2cf0dcf..d6bef4cbe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,8 +30,6 @@ gem 'daemons'
 gem 'net-ssh'
 gem 'net-sftp'
 
-gem 'memorylogic'
-
 group :development do
   gem 'newrelic_rpm'
   gem 'ruby-prof'
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index aabe37c6e..319f622bf 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,4 @@
 class ApplicationController < ActionController::Base
-  include Memorylogic
   protect_from_forgery
   helper :pagination
   before_filter :set_current_user
@@ -7,11 +6,18 @@ 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}"
+    Rails.logger.info" \e[1;31mParams:\e[0m #{params.inspect}"
+    Rails.logger.info "\e[1;31mUser: \e[0m#{CurrentUser.id}"
+  end
+
   def access_denied
     previous_url = params[:url] || request.fullpath
 
diff --git a/app/logical/memorylogic.rb b/app/logical/memorylogic.rb
new file mode 100644
index 000000000..136aca912
--- /dev/null
+++ b/app/logical/memorylogic.rb
@@ -0,0 +1,9 @@
+module Memorylogic
+  class << self
+    include ActionView::Helpers::NumberHelper
+  end
+
+  def self.memory_usage
+    number_to_human_size(`ps -o rss= -p #{Process.pid}`.to_i)
+  end
+end
diff --git a/config/application.rb b/config/application.rb
index baa179a83..44a833407 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,6 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
+require 'english'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line