rpc/comms reconnect ipc client after write error

Bas van Kervel · Bas van Kervel · commit 9bf17eb05a45 · 2015-08-19T21:48:56.000+02:00
diff --git a/rpc/comms/ipc.go b/rpc/comms/ipc.go
@@ -44,12 +44,14 @@ func (self *ipcClient) Close() {
 
 func (self *ipcClient) Send(req interface{}) error {
 	var err error
-	if err = self.coder.WriteResponse(req); err != nil {
-		if _, ok := err.(*net.OpError); ok { // connection lost, retry once
+	if r, ok := req.(*shared.Request); ok {
+		if err = self.coder.WriteResponse(r); err != nil {
 			if err = self.reconnect(); err == nil {
-				err = self.coder.WriteResponse(req)
+				err = self.coder.WriteResponse(r)
 			}
 		}
+
+		return err
 	}
 	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,14 @@ func (self *ipcClient) Close() {`
`44`	`44`
`45`	`45`	`func (self *ipcClient) Send(req interface{}) error {`
`46`	`46`	`var err error`
`47`		`- if err = self.coder.WriteResponse(req); err != nil {`
`48`		`- if _, ok := err.(*net.OpError); ok { // connection lost, retry once`
	`47`	`+ if r, ok := req.(*shared.Request); ok {`
	`48`	`+ if err = self.coder.WriteResponse(r); err != nil {`
`49`	`49`	`if err = self.reconnect(); err == nil {`
`50`		`- err = self.coder.WriteResponse(req)`
	`50`	`+ err = self.coder.WriteResponse(r)`
`51`	`51`	`}`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ return err`
`53`	`55`	`}`
`54`	`56`	`return err`
`55`	`57`	`}`