aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-12-11 17:27:43 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-12-11 17:27:43 +0100
commitc362beab2edd3dcae248dfaaaf3e0dee12baafa8 (patch)
treebc7a66088552b160b63e2c4287e577bac065b851
parenta86d50633939efead3a057302210dc25ee614b2f (diff)
parent84e7d76e37bbefc2ddf2f4a132aefac2b6c2a33f (diff)
downloadrails-c362beab2edd3dcae248dfaaaf3e0dee12baafa8.tar.gz
rails-c362beab2edd3dcae248dfaaaf3e0dee12baafa8.tar.bz2
rails-c362beab2edd3dcae248dfaaaf3e0dee12baafa8.zip
Merge pull request #57 from lsylvester/log-to-stdout-in-developement-mode
Add logging to stdout in development mode.
-rw-r--r--lib/action_cable/process/logging.rb2
-rw-r--r--lib/action_cable/server/configuration.rb8
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/action_cable/process/logging.rb b/lib/action_cable/process/logging.rb
index 72b1a080d1..618ba7357a 100644
--- a/lib/action_cable/process/logging.rb
+++ b/lib/action_cable/process/logging.rb
@@ -8,3 +8,5 @@ EM.error_handler do |e|
end
Celluloid.logger = ActionCable.server.logger
+
+ActionCable.server.config.log_to_stdout if Rails.env.development? \ No newline at end of file
diff --git a/lib/action_cable/server/configuration.rb b/lib/action_cable/server/configuration.rb
index b22de273b8..89a0caddb4 100644
--- a/lib/action_cable/server/configuration.rb
+++ b/lib/action_cable/server/configuration.rb
@@ -23,6 +23,14 @@ module ActionCable
@disable_request_forgery_protection = false
end
+ def log_to_stdout
+ console = ActiveSupport::Logger.new($stdout)
+ console.formatter = @logger.formatter
+ console.level = @logger.level
+
+ @logger.extend(ActiveSupport::Logger.broadcast(console))
+ end
+
def channel_paths
@channels ||= Dir["#{channels_path}/**/*_channel.rb"]
end