diff options
| author | Stan Hu <stanhu@gmail.com> | 2021-02-11 20:25:33 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2021-02-11 22:20:45 +0300 |
| commit | 9d3e8adb61e60bf09fe7a4db7c021ea57943d23e (patch) | |
| tree | 4d793409c944a21f7aae353362f22f29b6cb6644 /cmd/gitaly-wrapper | |
| parent | f38ab4f49c00e3a71ab4075fd12bb7bdce0e5d22 (diff) | |
Standardize Praefect and Gitaly log formats
Praefect was generating timestamps in the form of
`2021-02-11T17:18:09Z`, while Gitaly included millisecond precision in
`2021-02-11T17:26:53.011Z`.
Closes https://gitlab.com/gitlab-org/gitaly/-/issues/3427
Diffstat (limited to 'cmd/gitaly-wrapper')
| -rw-r--r-- | cmd/gitaly-wrapper/main.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/gitaly-wrapper/main.go b/cmd/gitaly-wrapper/main.go index e31c9e2e0..1a9ee929a 100644 --- a/cmd/gitaly-wrapper/main.go +++ b/cmd/gitaly-wrapper/main.go @@ -13,6 +13,7 @@ import ( "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/internal/log" "gitlab.com/gitlab-org/gitaly/internal/ps" ) @@ -22,7 +23,7 @@ const ( func main() { if jsonLogging() { - logrus.SetFormatter(&logrus.JSONFormatter{}) + logrus.SetFormatter(&logrus.JSONFormatter{TimestampFormat: log.LogTimestampFormat}) } if len(os.Args) < 2 { |