diff options
| author | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
|---|---|---|
| committer | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
| commit | 91480f3791f266369c343c539f8eeec245fa969a (patch) | |
| tree | a03ad6062fe4b546367cdb6f9921399458d97441 /modules/process | |
| parent | 835e85b5ce9921ffd4d50b90b706e02685167331 (diff) | |
| parent | 35c75f06a0a4f321021984830d760e67ca0ef8e5 (diff) | |
Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281
Conflicts:
modules/base/tool.go
Diffstat (limited to 'modules/process')
| -rw-r--r-- | modules/process/manager.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/process/manager.go b/modules/process/manager.go index ce8ab7b4..68c33315 100644 --- a/modules/process/manager.go +++ b/modules/process/manager.go @@ -78,7 +78,7 @@ func ExecDir(timeout time.Duration, dir, desc, cmdName string, args ...string) ( select { case <-time.After(timeout): if errKill := Kill(pid); errKill != nil { - log.Error("Exec(%d:%s): %v", pid, desc, errKill) + log.Error(4, "Exec(%d:%s): %v", pid, desc, errKill) } <-done return "", ErrExecTimeout.Error(), ErrExecTimeout |