aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/subscriber.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-15 12:15:49 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-15 12:24:31 +0100
commit6487d2871cbd44d769c483f47130e18d53e6e381 (patch)
tree34984f58948bff46a188ea82b5dc799c3b8f1ab0 /railties/lib/rails/subscriber.rb
parent88dd60298ef393e2406ab543a1124a4304a19f61 (diff)
downloadrails-6487d2871cbd44d769c483f47130e18d53e6e381.tar.gz
rails-6487d2871cbd44d769c483f47130e18d53e6e381.tar.bz2
rails-6487d2871cbd44d769c483f47130e18d53e6e381.zip
Fix an issue where log was not being tailed in the first request.
Diffstat (limited to 'railties/lib/rails/subscriber.rb')
-rw-r--r--railties/lib/rails/subscriber.rb11
1 files changed, 2 insertions, 9 deletions
diff --git a/railties/lib/rails/subscriber.rb b/railties/lib/rails/subscriber.rb
index 2c62f178b8..e8d13babf0 100644
--- a/railties/lib/rails/subscriber.rb
+++ b/railties/lib/rails/subscriber.rb
@@ -33,9 +33,8 @@ module Rails
# Subscriber also has some helpers to deal with logging and automatically flushes
# all logs when the request finishes (via action_dispatch.callback notification).
class Subscriber
- mattr_accessor :colorize_logging, :tail_log
+ mattr_accessor :colorize_logging, :log_tailer
self.colorize_logging = true
- self.tail_log = false
# Embed in a String to clear all previous ANSI sequences.
CLEAR = "\e[0m"
@@ -59,12 +58,6 @@ module Rails
@subscribers ||= {}
end
- # Use Rails::Rack::LogTailer to do the log tailing.
- # TODO Leave this as middleware or move inside Subscriber?
- def self.log_tailer
- @log_tailer ||= Rails::Rack::LogTailer.new(nil, "log/#{Rails.env}.log")
- end
-
def self.dispatch(args)
namespace, name = args[0].split(".")
subscriber = subscribers[namespace.to_sym]
@@ -75,7 +68,7 @@ module Rails
if args[0] == "action_dispatch.callback" && !subscribers.empty?
flush_all!
- log_tailer.tail! if tail_log
+ log_tailer.tail! if log_tailer
end
end