Commit 72338fcd authored by Bob Van Landuyt's avatar Bob Van Landuyt 💬
Browse files

Merge branch 'dbarrett/json_logger_format_data' into 'master' 

refactor(logging): Extract format_data method from JsonLogger

See merge request !221

Merged-by: Bob Van Landuyt's avatarBob Van Landuyt <bob@gitlab.com>
Approved-by: Bob Van Landuyt's avatarBob Van Landuyt <bob@gitlab.com>
Co-authored-by: default avatardbarrett <dbarrett@gitlab.com>
parents 2435b0cd ba50715c

lib/labkit/logging/json_logger.rb

+7 −1
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ module Labkit 
      end



      def format_message(severity, timestamp, progname, message)

        data = format_data(severity, timestamp, progname, message)



        dump_json(data) << "\n"

      end



      def format_data(severity, timestamp, progname, message)

        data = default_attributes

        data[:severity] = severity

        data[:time] = timestamp.utc.iso8601(3)
@@ -57,7 +63,7 @@ module Labkit 
          data.merge!(message)

        end



        dump_json(data) << "\n"

        data

      end



      private