diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
| commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
| tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /workhorse/logging.go | |
| parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
| download | gitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'workhorse/logging.go')
| -rw-r--r-- | workhorse/logging.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/workhorse/logging.go b/workhorse/logging.go index 69718e6e834..e2e603b15e8 100644 --- a/workhorse/logging.go +++ b/workhorse/logging.go @@ -3,7 +3,6 @@ package main import ( "fmt" "io" - "io/ioutil" goLog "log" "os" @@ -28,7 +27,7 @@ func startLogging(file string, format string) (io.Closer, error) { switch format { case noneLogType: - return logkit.Initialize(logkit.WithWriter(ioutil.Discard)) + return logkit.Initialize(logkit.WithWriter(io.Discard)) case jsonLogFormat: return logkit.Initialize( logkit.WithOutputName(file), @@ -53,7 +52,7 @@ func startLogging(file string, format string) (io.Closer, error) { // In text format, we use a separate logger for access logs func getAccessLogger(file string, format string) (*log.Logger, io.Closer, error) { if format != "text" { - return log.StandardLogger(), ioutil.NopCloser(nil), nil + return log.StandardLogger(), io.NopCloser(nil), nil } if file == "" { |