github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 09:51:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Consolidate Unicorn error backtraces when logstash is enabled.

Browse Source
This commit is contained in:
Guo Xiang Tan
2020-07-21 15:34:37 +08:00
parent 23778f4bfd
commit bb8f1ce8b1
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/unicorn.conf.rb
View File

@ -4,6 +4,7 @@
if (ENV["LOGSTASH_UNICORN_URI"] || "").length > 0 if (ENV["LOGSTASH_UNICORN_URI"] || "").length > 0
require_relative '../lib/discourse_logstash_logger' require_relative '../lib/discourse_logstash_logger'
require_relative '../lib/unicorn_logstash_patch'
logger DiscourseLogstashLogger.logger(uri: ENV['LOGSTASH_UNICORN_URI'], type: :unicorn) logger DiscourseLogstashLogger.logger(uri: ENV['LOGSTASH_UNICORN_URI'], type: :unicorn)
end end

12
lib/unicorn_logstash_patch.rb Normal file
View File

@ -0,0 +1,12 @@
# See https://github.com/defunkt/unicorn/commit/5f478f5a9a58f72c0a844258b8ee614bf24ea9f7
# Unicorn originally logs backtrace line by line with `exc.backtrace.each { |line| logger.error(line) }`.
# However, that means we get a separate logstash message for each backtrace which isn't what we want. The
# monkey patch here overrides Unicorn's logging of error so that we log the error and backtrace in a
# single message.
module Unicorn
def self.log_error(logger, prefix, exc)
message = exc.message
message = message.dump if /[[:cntrl:]]/ =~ message
logger.error "#{prefix}: #{message} (#{exc.class})\n#{exc.backtrace.join("\n")}"
end
end