aboutsummaryrefslogtreecommitdiffstats
path: root/modules/git/command.go
diff options
context:
space:
mode:
author6543 <6543@obermui.de>2021-06-25 18:54:08 +0200
committerGitHub <noreply@github.com>2021-06-25 17:54:08 +0100
commit3ef23d5411732b4b714d6fc9739bc5dac75aadd4 (patch)
tree46e34859fe8aff472da725a9b50d686d50167f3e /modules/git/command.go
parent44b8b07631666e3ae691149bdba31ca0f51569f5 (diff)
downloadgitea-3ef23d5411732b4b714d6fc9739bc5dac75aadd4.tar.gz
gitea-3ef23d5411732b4b714d6fc9739bc5dac75aadd4.zip
Use gitea logging module for git module (#16243)
remove log() func from gogs times and switch to proper logging Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'modules/git/command.go')
-rw-r--r--modules/git/command.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/git/command.go b/modules/git/command.go
index ef78464d5f..2e375fd4f9 100644
--- a/modules/git/command.go
+++ b/modules/git/command.go
@@ -15,6 +15,7 @@ import (
"strings"
"time"
+ "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
)
@@ -114,9 +115,9 @@ func (c *Command) RunInDirTimeoutEnvFullPipelineFunc(env []string, timeout time.
}
if len(dir) == 0 {
- log(c.String())
+ log.Debug("%s", c)
} else {
- log("%s: %v", dir, c)
+ log.Debug("%s: %v", dir, c)
}
ctx, cancel := context.WithTimeout(c.parentContext, timeout)
@@ -197,9 +198,8 @@ func (c *Command) RunInDirTimeoutEnv(env []string, timeout time.Duration, dir st
if err := c.RunInDirTimeoutEnvPipeline(env, timeout, dir, stdout, stderr); err != nil {
return nil, ConcatenateError(err, stderr.String())
}
-
- if stdout.Len() > 0 {
- log("stdout:\n%s", stdout.Bytes()[:1024])
+ if stdout.Len() > 0 && log.IsTrace() {
+ log.Trace("Stdout:\n %s", stdout.Bytes()[:1024])
}
return stdout.Bytes(), nil
}