Remove socket if exists

Michael Chang · Michael Chang · commit 91f17be6f547 · 2020-02-28T11:35:55.000-06:00
diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -229,6 +229,7 @@ func (a *Agent) startAgentListener() error {
 		os.Remove(f.Name())
 	}
 
+	os.Remove(a.agentSocketPath) //remove socket if it exists
 	agentListener, err := net.Listen("unix", a.agentSocketPath)
 	if err != nil {
 		a.Close()
@@ -315,6 +316,7 @@ func (a *Agent) startControlListener() error {
 		os.Remove(f.Name())
 	}
 
+	os.Remove(a.controlSocketPath)
 	authnListener, err := net.Listen("unix", a.controlSocketPath)
 	if err != nil {
 		a.Close()

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,7 @@ func (a *Agent) startAgentListener() error {`
`229`	`229`	`os.Remove(f.Name())`
`230`	`230`	`}`
`231`	`231`
	`232`	`+ os.Remove(a.agentSocketPath) //remove socket if it exists`
`232`	`233`	`agentListener, err := net.Listen("unix", a.agentSocketPath)`
`233`	`234`	`if err != nil {`
`234`	`235`	`a.Close()`
`@@ -315,6 +316,7 @@ func (a *Agent) startControlListener() error {`
`315`	`316`	`os.Remove(f.Name())`
`316`	`317`	`}`
`317`	`318`
	`319`	`+ os.Remove(a.controlSocketPath)`
`318`	`320`	`authnListener, err := net.Listen("unix", a.controlSocketPath)`
`319`	`321`	`if err != nil {`
`320`	`322`	`a.Close()`