From fdff706336b3a59afd52c9c41af1cdbc6a9faa3f Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 17 Feb 2013 17:33:09 -0500 Subject: [PATCH] add tagged logging --- Gemfile | 2 ++ app/controllers/application_controller.rb | 1 + config/application.rb | 1 + 3 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index d6bef4cbe..6c2cf0dcf 100644 --- a/Gemfile +++ b/Gemfile @@ -30,6 +30,8 @@ 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 ce56d8519..aabe37c6e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,4 +1,5 @@ class ApplicationController < ActionController::Base + include Memorylogic protect_from_forgery helper :pagination before_filter :set_current_user diff --git a/config/application.rb b/config/application.rb index 9df0324d1..baa179a83 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,6 +22,7 @@ module Danbooru config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = {:enable_starttls_auto => false} config.action_mailer.perform_deliveries = true + config.log_tags = ["PID:#{$PROCESS_ID}"] end end