From 1f5ae4827ea2391b9d08685b06caed7affda6994 Mon Sep 17 00:00:00 2001 From: James Phillips Date: Fri, 23 Sep 2016 17:43:40 -0700 Subject: [PATCH 1/2] Makes string search for Windows case-insensitive. Fixes #2356. --- command/agent/rpc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/agent/rpc.go b/command/agent/rpc.go index 9232be5750..e1dfecb21e 100644 --- a/command/agent/rpc.go +++ b/command/agent/rpc.go @@ -323,7 +323,7 @@ func (i *AgentRPC) handleClient(client *rpcClient) { // The second part of this if is to block socket // errors from Windows which appear to happen every // time there is an EOF. - if err != io.EOF && !strings.Contains(err.Error(), "WSARecv") { + if err != io.EOF && !strings.Contains(strings.ToLower(err.Error()), "wsarecv") { i.logger.Printf("[ERR] agent.rpc: failed to decode request header: %v", err) } } From 5f0835fae798ace56eb1458964bd3ac8a140cc67 Mon Sep 17 00:00:00 2001 From: James Phillips Date: Fri, 23 Sep 2016 17:44:14 -0700 Subject: [PATCH 2/2] Runs go-fmt (incidental to this PR). --- command/agent/gated_writer.go | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/command/agent/gated_writer.go b/command/agent/gated_writer.go index 602f018a4d..2faccbbe24 100644 --- a/command/agent/gated_writer.go +++ b/command/agent/gated_writer.go @@ -29,28 +29,28 @@ func (w *GatedWriter) Flush() { } func (w *GatedWriter) Write(p []byte) (n int, err error) { - // Once we flush we no longer synchronize writers since there's - // no use of the internal buffer. This is the happy path. - w.lock.RLock() - if w.flush { - w.lock.RUnlock() - return w.Writer.Write(p) - } - w.lock.RUnlock() + // Once we flush we no longer synchronize writers since there's + // no use of the internal buffer. This is the happy path. + w.lock.RLock() + if w.flush { + w.lock.RUnlock() + return w.Writer.Write(p) + } + w.lock.RUnlock() - // Now take the write lock. - w.lock.Lock() - defer w.lock.Unlock() + // Now take the write lock. + w.lock.Lock() + defer w.lock.Unlock() - // Things could have changed between the locking operations, so we - // have to check one more time. - if w.flush { - return w.Writer.Write(p) - } + // Things could have changed between the locking operations, so we + // have to check one more time. + if w.flush { + return w.Writer.Write(p) + } - // Buffer up the written data. - p2 := make([]byte, len(p)) - copy(p2, p) - w.buf = append(w.buf, p2) - return len(p), nil + // Buffer up the written data. + p2 := make([]byte, len(p)) + copy(p2, p) + w.buf = append(w.buf, p2) + return len(p), nil }