Refs #28384 - handle case when request ID is missing

hsahmed · Aug 7, 2020 · d5ae868 · d5ae868
1 parent 9df1c2b
commit d5ae868
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/lib/foreman/logging.rb b/lib/foreman/logging.rb
@@ -258,8 +258,18 @@ def indent_lines(string)
     end
 
     class MultilineRequestPatternLayout < MultilinePatternLayout
+      private
+
       def indent_lines(string)
-        string.gsub("\n", "\n #{::Logging.mdc['request'].split('-').first} | ")
+        if request_id
+          string.gsub("\n", "\n #{request_id.split('-').first} | ")
+        else
+          super(string)
+        end
+      end
+
+      def request_id
+        ::Logging.mdc['request']
       end
     end
   end