reduce lock scope

pull/10346/head
Yanshu Zhao 2021-02-02 21:20:31 +00:00
parent 8009a5b3a8
commit 84e7c47e8a
1 changed files with 7 additions and 3 deletions

View File

@ -138,14 +138,18 @@ func runCmd(cmd *exec.Cmd, warnSlow ...bool) (*RunResult, error) {
if warn { if warn {
if elapsed > warnTime { if elapsed > warnTime {
warnLock.Lock() warnLock.Lock()
defer warnLock.Unlock() _, ok := alreadyWarnedCmds[rr.Command()]
if _, ok := alreadyWarnedCmds[rr.Command()]; !ok { if !ok {
alreadyWarnedCmds[rr.Command()] = true
}
warnLock.Unlock()
if !ok {
out.WarningT(`Executing "{{.command}}" took an unusually long time: {{.duration}}`, out.V{"command": rr.Command(), "duration": elapsed}) out.WarningT(`Executing "{{.command}}" took an unusually long time: {{.duration}}`, out.V{"command": rr.Command(), "duration": elapsed})
// Don't show any restarting hint, when running podman locally (on linux, with sudo). Only when having a service. // Don't show any restarting hint, when running podman locally (on linux, with sudo). Only when having a service.
if cmd.Args[0] != "sudo" { if cmd.Args[0] != "sudo" {
out.ErrT(style.Tip, `Restarting the {{.name}} service may improve performance.`, out.V{"name": cmd.Args[0]}) out.ErrT(style.Tip, `Restarting the {{.name}} service may improve performance.`, out.V{"name": cmd.Args[0]})
} }
alreadyWarnedCmds[rr.Command()] = true
} }
} }