Skip to content

client: make use of shutdownLock on Read access #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hw-claudio wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Open

client: make use of shutdownLock on Read access #784

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions client/rpc_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ type RPCClient struct {

shutdown bool
shutdownCh chan struct{}
shutdownLock sync.Mutex
shutdownLock sync.RWMutex
}

// send is used to send an object using the MsgPack encoding. send
Expand All @@ -89,7 +89,7 @@ func (c *RPCClient) send(header *requestHeader, obj interface{}) error {
c.writeLock.Lock()
defer c.writeLock.Unlock()

if c.shutdown {
if c.IsClosed() {
return clientClosed
}

Expand Down Expand Up @@ -184,6 +184,8 @@ func ClientFromConfig(c *Config) (*RPCClient, error) {
type StreamHandle uint64

func (c *RPCClient) IsClosed() bool {
c.shutdownLock.RLock()
defer c.shutdownLock.RUnlock()
return c.shutdown
}

Expand Down Expand Up @@ -848,7 +850,7 @@ func (c *RPCClient) listen() {
var respHeader responseHeader
for {
if err := c.dec.Decode(&respHeader); err != nil {
if !c.shutdown {
if !c.IsClosed() {
log.Printf("[ERR] agent.client: Failed to decode response header: %v", err)
}
break
Expand Down
Loading