fixup! Use endpoint as default connection option (ADR-119)

surminus · surminus · commit ee7c1b1bd801 · 2025-01-08T09:48:20.000Z
diff --git a/ably/options.go b/ably/options.go
@@ -63,12 +63,14 @@ var defaultOptions = clientOptions{
 	LogLevel:                 LogWarning, // RSC2
 }
 
+var nonprodRegexp = regexp.MustCompile(`^nonprod:(.*)$`)
+
 func defaultFallbackHosts() []string {
 	return endpointFallbacks("main", "ably-realtime.com")
 }
 
 func getEndpointFallbackHosts(endpoint string) []string {
-	if match := regexp.MustCompile(`^nonprod:(.*)$`).FindStringSubmatch(endpoint); match != nil {
+	if match := nonprodRegexp.FindStringSubmatch(endpoint); match != nil {
 		namespace := match[1]
 		return endpointFallbacks(namespace, "ably-realtime-nonprod.com")
 	}
@@ -504,7 +506,7 @@ func (opts *clientOptions) getEndpoint() string {
 		return endpoint
 	}
 
-	if match := regexp.MustCompile(`^nonprod:(.*)$`).FindStringSubmatch(endpoint); match != nil {
+	if match := nonprodRegexp.FindStringSubmatch(endpoint); match != nil {
 		namespace := match[1]
 		return fmt.Sprintf("%s.realtime.ably-nonprod.net", namespace)
 	}

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,14 @@ var defaultOptions = clientOptions{`
`63`	`63`	`LogLevel: LogWarning, // RSC2`
`64`	`64`	`}`
`65`	`65`
	`66`	+var nonprodRegexp = regexp.MustCompile(`^nonprod:(.*)$`)
	`67`	`+`
`66`	`68`	`func defaultFallbackHosts() []string {`
`67`	`69`	`return endpointFallbacks("main", "ably-realtime.com")`
`68`	`70`	`}`
`69`	`71`
`70`	`72`	`func getEndpointFallbackHosts(endpoint string) []string {`
`71`		- if match := regexp.MustCompile(`^nonprod:(.*)$`).FindStringSubmatch(endpoint); match != nil {
	`73`	`+ if match := nonprodRegexp.FindStringSubmatch(endpoint); match != nil {`
`72`	`74`	`namespace := match[1]`
`73`	`75`	`return endpointFallbacks(namespace, "ably-realtime-nonprod.com")`
`74`	`76`	`}`
`@@ -504,7 +506,7 @@ func (opts *clientOptions) getEndpoint() string {`
`504`	`506`	`return endpoint`
`505`	`507`	`}`
`506`	`508`
`507`		- if match := regexp.MustCompile(`^nonprod:(.*)$`).FindStringSubmatch(endpoint); match != nil {
	`509`	`+ if match := nonprodRegexp.FindStringSubmatch(endpoint); match != nil {`
`508`	`510`	`namespace := match[1]`
`509`	`511`	`return fmt.Sprintf("%s.realtime.ably-nonprod.net", namespace)`
`510`	`512`	`}`