grim/hgkeeper

Rework the command teardown function a bit

2019-09-17, Gary Kramlich
19032dd26afd
Parents 2f2d7fef584c
Children 9b5726551384
Rework the command teardown function a bit
1 files changed, 13 insertions(+), 10 deletions(-)
  • +13 -10
    ssh/commands/run.go
    • --- a/ssh/commands/run.go Tue Sep 17 21:38:36 2019 -0500
    +++ b/ssh/commands/run.go Tue Sep 17 21:44:25 2019 -0500
    @@ -19,8 +19,6 @@
    }
    teardown := func() {
    - conn.Close()
    -
    hgCmd.Teardown()
    if err := cmd.Wait(); err != nil {
    @@ -31,17 +29,22 @@
    err,
    )
    - req.Reply(false, nil)
    + if req.WantReply {
    + req.Reply(false, nil)
    + }
    + } else {
    + log.Debugf(
    + "%s command %s finished",
    + serverConn.RemoteAddr(),
    + strings.Join(cmd.Args, " "),
    + )
    - return
    + if req.WantReply {
    + req.Reply(true, nil)
    + }
    }
    - log.Debugf(
    - "%s command %s finished",
    - serverConn.RemoteAddr(),
    - strings.Join(cmd.Args, " "),
    - )
    - req.Reply(true, nil)
    + conn.Close()
    }
    stdinWriter, err := cmd.StdinPipe()