Keep recovery advice out of log events

[onechat] / tools.go

diff --git a/tools.go b/tools.go
index 11e208d49e82dd4b8c51b128d3558eba9e7c48af..191bb251df369a99984dbbc683ac593b13b9d364 100644 (file)
--- a/tools.go
+++ b/tools.go
@@ -494,9 +494,11 @@ func (b *Toolbox) shell(ctx context.Context, command string) string {
        cmd.SysProcAttr = &syscall.SysProcAttr{
                Setpgid: true,
        }
+
        cmd.Cancel = func() error {
                return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
        }
+
        cmd.WaitDelay = toolShellOutputTimeout
 
        output := &ToolHeadTail{}
@@ -542,8 +544,7 @@ func (b *Toolbox) read(path string) (text string, err error) {
        return output.String(), nil
 }
 
-// write replaces the file at path with text, and makes its missing
-// directories.
+// write replaces the file at path with text, and makes its missing directories.
 func (b *Toolbox) write(path, text string) (string, error) {
        path = b.path(path)
        err := os.MkdirAll(filepath.Dir(path), 0o755)
@@ -559,8 +560,8 @@ func (b *Toolbox) write(path, text string) (string, error) {
        return fmt.Sprintf("wrote %d bytes to %s", len(text), path), nil
 }
 
-// edit replaces the one occurrence of old in the file at path with
-// replacement. It keeps the mode of the file.
+// edit replaces the one occurrence of old in the file at path with replacement.
+// It keeps the mode of the file.
 func (b *Toolbox) edit(path, old, replacement string) (string, error) {
        path = b.path(path)
        data, err := os.ReadFile(path)
@@ -590,8 +591,7 @@ func (b *Toolbox) edit(path, old, replacement string) (string, error) {
        return "edited " + path, nil
 }
 
-// path returns path, relative to the working directory when it is not
-// absolute.
+// path returns path, relative to the working directory when it is not absolute.
 func (b *Toolbox) path(path string) string {
        if filepath.IsAbs(path) {
                return path