jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix searches

Browse Source
This commit is contained in:
albert
2013-02-17 21:09:25 -05:00
parent 424c9c94a8
commit 44682156c0
12 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -29,7 +29,6 @@ gem 'rmagick', :require => "RMagick"
gem 'daemons' gem 'daemons'
gem 'net-ssh' gem 'net-ssh'
gem 'net-sftp' gem 'net-sftp'
gem 'sys-proctable', :require => "sys/proctable"
group :development do group :development do
gem 'newrelic_rpm' gem 'newrelic_rpm'

2
Gemfile.lock
View File

@@ -159,7 +159,6 @@ GEM
super_exception_notifier (3.0.13) super_exception_notifier (3.0.13)
actionmailer actionmailer
rake rake
sys-proctable (0.9.2)
therubyracer (0.11.3) therubyracer (0.11.3)
libv8 (~> 3.11.8.12) libv8 (~> 3.11.8.12)
ref ref
@@ -208,7 +207,6 @@ DEPENDENCIES
simple_form simple_form
simplecov simplecov
super_exception_notifier super_exception_notifier
sys-proctable
therubyracer therubyracer
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
whenever whenever

4
app/controllers/application_controller.rb
View File

@@ -6,15 +6,11 @@ class ApplicationController < ActionController::Base
before_filter :initialize_cookies before_filter :initialize_cookies
before_filter :set_title before_filter :set_title
before_filter :set_started_at_session before_filter :set_started_at_session
after_filter :log_memory_usage
layout "default" layout "default"
rescue_from User::PrivilegeError, :with => :access_denied rescue_from User::PrivilegeError, :with => :access_denied
protected 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 def access_denied
previous_url = params[:url] || request.fullpath previous_url = params[:url] || request.fullpath

2
app/controllers/comments_controller.rb
View File

@@ -14,7 +14,7 @@ class CommentsController < ApplicationController
end end
def search def search
@search = Comment.search(params[:search]) # @search = Comment.search(params[:search])
end end
def update def update

3
app/controllers/dmails_controller.rb
View File

@@ -20,8 +20,7 @@ class DmailsController < ApplicationController
end end
def search def search
@search = Dmail.search(params[:search]) # @search = Dmail.search(params[:search])
respond_with(@dmails)
end end
def show def show

2
app/controllers/forum_posts_controller.rb
View File

@@ -22,7 +22,7 @@ class ForumPostsController < ApplicationController
end end
def search def search
@search = ForumPost.search(params[:search]) # @search = ForumPost.search(params[:search])
end end
def show def show

2
app/controllers/notes_controller.rb
View File

@@ -4,7 +4,7 @@ class NotesController < ApplicationController
before_filter :pass_html_id, :only => [:create] before_filter :pass_html_id, :only => [:create]
def search def search
@search = Note.search(params[:search]) # @search = Note.search(params[:search])
end end
def index def index

2
app/controllers/pools_controller.rb
View File

@@ -21,7 +21,7 @@ class PoolsController < ApplicationController
end end
def search def search
@search = Pool.search(params[:search]) # @search = Pool.search(params[:search])
end end
def show def show

2
app/controllers/post_versions_controller.rb
View File

@@ -8,6 +8,6 @@ class PostVersionsController < ApplicationController
end end
def search def search
@search = PostVersion.search(params[:search]) # @search = PostVersion.search(params[:search])
end end
end end

2
app/controllers/users_controller.rb
View File

@@ -21,7 +21,7 @@ class UsersController < ApplicationController
end end
def search def search
@search = User.search(params[:search]) # @search = User.search(params[:search])
end end
def show def show

14
app/logical/memorylogic.rb
View File

@@ -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

8
config/initializers/memory_logic.rb
View File

@@ -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