diff options
| author | James Lopez <james@gitlab.com> | 2019-07-12 06:21:44 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-07-12 06:21:44 +0000 |
| commit | 4c6bdd23b32940bc1687ef7879821cd8772340b2 (patch) | |
| tree | 081fc42f3a02ee64a91aa2613e1bafcac89f04e9 /app | |
| parent | 0b71325dc00ac459636625e743133c0bc0b4cb33 (diff) | |
| parent | e19499caf53c7da022333b1f354be058955991e8 (diff) | |
| download | gitlab-ce-4c6bdd23b32940bc1687ef7879821cd8772340b2.tar.gz | |
Merge branch 'sh-audit-event-json-log-format-from-and-to' into 'master'
Format `from` and `to` fields in JSON audit log
See merge request gitlab-org/gitlab-ce!30333
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/audit_event_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/audit_event_service.rb b/app/services/audit_event_service.rb index 201048aaba5..73f3408a240 100644 --- a/app/services/audit_event_service.rb +++ b/app/services/audit_event_service.rb @@ -35,8 +35,12 @@ class AuditEventService @file_logger ||= Gitlab::AuditJsonLogger.build end + def formatted_details + @details.merge(@details.slice(:from, :to).transform_values(&:to_s)) + end + def log_security_event_to_file - file_logger.info(base_payload.merge(@details)) + file_logger.info(base_payload.merge(formatted_details)) end def log_security_event_to_database |