Files
gf/contrib/registry/consul/consul_watcher.go
hailaz ee24da4e72 refactor: interface{} to any and reflect.Ptr to reflect.Pointer (#4395)
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.

**Type alias migration to `any`:**

* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)

**Generated code and templates:**

* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)

**Container and utility updates:**

* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)

These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
2025-08-28 16:53:19 +08:00

210 lines
4.4 KiB
Go

// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
//
// This Source Code Form is subject to the terms of the MIT License.
// If a copy of the MIT was not distributed with this file,
// You can obtain one at https://github.com/gogf/gf.
package consul
import (
"encoding/json"
"fmt"
"sort"
"sync"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/api/watch"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/net/gsvc"
)
// Watcher watches the service changes.
type Watcher struct {
registry *Registry // The registry instance
key string // The service name to watch
closeChan chan struct{} // Channel for closing
eventChan chan struct{} // Channel for notifying changes
mu sync.RWMutex // Mutex for thread safety
plan *watch.Plan // The watch plan
services []gsvc.Service // Current services
}
// New creates and returns a new watcher.
func newWatcher(registry *Registry, key string) (*Watcher, error) {
w := &Watcher{
registry: registry,
key: key,
closeChan: make(chan struct{}),
eventChan: make(chan struct{}, 1),
}
// Start watching
go w.watch()
return w, nil
}
// watch starts the watching process.
func (w *Watcher) watch() {
// Get initial service list
initServices, err := w.Services()
if err != nil {
return
}
// Set initial services
w.mu.Lock()
w.services = initServices
w.mu.Unlock()
// Create watch plan
plan, err := watch.Parse(map[string]any{
"type": "service",
"service": w.key,
})
if err != nil {
return
}
w.mu.Lock()
w.plan = plan
w.mu.Unlock()
// Set handler
plan.Handler = func(idx uint64, data any) {
// Check if watcher is closed
select {
case <-w.closeChan:
return
default:
}
// Get current services
services, _ := w.Services()
// Update services
w.mu.Lock()
w.services = services
w.mu.Unlock()
// Notify changes
select {
case w.eventChan <- struct{}{}:
default:
}
}
// Start watching
go func() {
defer func() {
w.mu.Lock()
if w.plan != nil {
w.plan.Stop()
w.plan = nil
}
w.mu.Unlock()
}()
if err = plan.Run(w.registry.GetAddress()); err != nil {
return
}
}()
// Wait for close signal
<-w.closeChan
}
// Proceed returns current services and waits for the next service change.
func (w *Watcher) Proceed() ([]gsvc.Service, error) {
// Check if watcher is closed
select {
case <-w.closeChan:
return nil, gerror.New("watcher closed")
default:
}
w.mu.RLock()
services := w.services
w.mu.RUnlock()
// Wait for changes
select {
case <-w.closeChan:
return nil, gerror.New("watcher closed")
case <-w.eventChan:
w.mu.RLock()
services = w.services
w.mu.RUnlock()
return services, nil
}
}
// Close closes the watcher.
func (w *Watcher) Close() error {
w.mu.Lock()
defer w.mu.Unlock()
select {
case <-w.closeChan:
return nil
default:
close(w.closeChan)
if w.plan != nil {
w.plan.Stop()
w.plan = nil
}
return nil
}
}
// Services returns current services from the watcher.
func (w *Watcher) Services() ([]gsvc.Service, error) {
// Query services directly from Consul
entries, _, err := w.registry.client.Health().Service(w.key, "", true, &api.QueryOptions{})
if err != nil {
return nil, err
}
// Convert entries to services
var services []gsvc.Service
for _, entry := range entries {
if entry.Checks.AggregatedStatus() == api.HealthPassing {
metadata := make(map[string]any)
if entry.Service.Meta != nil {
if metaStr, ok := entry.Service.Meta["metadata"]; ok {
if err := json.Unmarshal([]byte(metaStr), &metadata); err != nil {
return nil, gerror.Wrap(err, "failed to unmarshal metadata")
}
}
}
// Get version from metadata or tags
version := ""
if v, ok := entry.Service.Meta["version"]; ok {
version = v
} else if len(entry.Service.Tags) > 0 {
version = entry.Service.Tags[0]
}
// Create service instance
service := &gsvc.LocalService{
Name: entry.Service.Service,
Version: version,
Metadata: metadata,
Endpoints: []gsvc.Endpoint{
gsvc.NewEndpoint(fmt.Sprintf("%s:%d", entry.Service.Address, entry.Service.Port)),
},
}
services = append(services, service)
}
}
// Sort services by version
if len(services) > 0 {
sort.Slice(services, func(i, j int) bool {
return services[i].GetVersion() < services[j].GetVersion()
})
}
return services, nil
}