Merge branch 'replica' of github.com:coder/coder into replica

kylecarbs · kylecarbs · commit efb6ecebd852 · 2022-10-15T19:51:53.000Z
diff --git a/enterprise/derpmesh/derpmesh.go b/enterprise/derpmesh/derpmesh.go
@@ -82,7 +82,7 @@ func (m *Mesh) SetAddresses(addresses []string) {
 	m.mutex.Unlock()
 }
 
-// addAddress begins meshing with a new address.
+// addAddress begins meshing with a new address. It returns false if the address is already being meshed with.
 // It's expected that this is a full HTTP address with a path.
 // e.g. http://127.0.0.1:8080/derp
 func (m *Mesh) addAddress(address string) (bool, error) {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func (m *Mesh) SetAddresses(addresses []string) {`
`82`	`82`	`m.mutex.Unlock()`
`83`	`83`	`}`
`84`	`84`
`85`		`-// addAddress begins meshing with a new address.`
	`85`	`+// addAddress begins meshing with a new address. It returns false if the address is already being meshed with.`
`86`	`86`	`// It's expected that this is a full HTTP address with a path.`
`87`	`87`	`// e.g. http://127.0.0.1:8080/derp`
`88`	`88`	`func (m *Mesh) addAddress(address string) (bool, error) {`