diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/elasticsearch/logger.rb | 11 | ||||
| -rw-r--r-- | lib/gitlab/puma_logging/json_formatter.rb | 13 | ||||
| -rw-r--r-- | lib/gitlab/quick_actions/issue_actions.rb | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/lib/gitlab/elasticsearch/logger.rb b/lib/gitlab/elasticsearch/logger.rb new file mode 100644 index 00000000000..86cd1d942f2 --- /dev/null +++ b/lib/gitlab/elasticsearch/logger.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Gitlab + module Elasticsearch + class Logger < ::Gitlab::JsonLogger + def self.file_name_noext + 'elasticsearch' + end + end + end +end diff --git a/lib/gitlab/puma_logging/json_formatter.rb b/lib/gitlab/puma_logging/json_formatter.rb new file mode 100644 index 00000000000..9eeb980fc53 --- /dev/null +++ b/lib/gitlab/puma_logging/json_formatter.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +require 'json' + +module Gitlab + module PumaLogging + class JSONFormatter + def call(str) + { timestamp: Time.now.utc.iso8601(3), pid: $$, message: str }.to_json + end + end + end +end diff --git a/lib/gitlab/quick_actions/issue_actions.rb b/lib/gitlab/quick_actions/issue_actions.rb index 838aefb59f0..b0aae363749 100644 --- a/lib/gitlab/quick_actions/issue_actions.rb +++ b/lib/gitlab/quick_actions/issue_actions.rb @@ -183,6 +183,7 @@ module Gitlab command :zoom do |link| result = @zoom_service.add_link(link) @execution_message[:zoom] = result.message + @updates.merge!(result.payload) if result.payload end desc _('Remove Zoom meeting') |