safcm: don't hang on error before a connection is established

[safcm/safcm.git] / rpc / conn.go

diff --git a/rpc/conn.go b/rpc/conn.go
index c59bbd323272b50b150fa5d6671d61bdf022b800..03b748545f12c1c588acb24bac2761e0b439b25c 100644 (file)
--- a/rpc/conn.go
+++ b/rpc/conn.go
@@ -32,8 +32,9 @@ type Conn struct {
        events   chan<- ConnEvent // same as Events, to publish events
        eventsWg sync.WaitGroup
 
-       debug  bool
-       remote string
+       debug     bool
+       sshRemote string
+       sshOpts   []string
 
        cmd  *exec.Cmd
        conn *safcm.GobConn
@@ -42,10 +43,10 @@ type Conn struct {
 type ConnEventType int
 
 const (
-       _ ConnEventType = iota
-       ConnEventStderr
-       ConnEventDebug
-       ConnEventUpload
+       _               ConnEventType = iota
+       ConnEventStderr               // stderr from spawned process
+       ConnEventDebug                // debug message
+       ConnEventUpload               // remote helper upload in progress
 )
 
 type ConnEvent struct {
@@ -54,7 +55,7 @@ type ConnEvent struct {
 }
 
 // NewConn creates a new connection. Events in the returned struct must be
-// regularly read or the connection will stall. This must be done before
+// regularly read or the connection will hang. This must be done before
 // DialSSH is called to open a connection.
 func NewConn(debug bool) *Conn {
        ch := make(chan ConnEvent)
@@ -123,9 +124,14 @@ func (c *Conn) wait() error {
 }
 
 // Kill forcefully terminates the connection. It's safe to call Kill (and
-// Wait) multiple times.
+// Wait) multiple times. Calling it before Dial*() was called will only close
+// the Events channel.
 func (c *Conn) Kill() error {
        if c.cmd == nil {
+               if c.events != nil {
+                       close(c.events)
+                       c.events = nil
+               }
                return fmt.Errorf("Dial*() not called or already terminated")
        }