mirror of
https://github.com/weaveworks/scope.git
synced 2026-03-03 18:20:27 +00:00
7d51f173ea
- App takes POST report on /api/report - Probe publishes to configured target(s) - Name resolution happens on probe-side - There's no longer an xfer.ProbePort - xfer.Collector responsibility is reduced - Fixes to remaining experimental components. - rm experimental/bridge: it's not being used, and by changing the app/probe comm model, it would require a complete refactor anyway. We can easily rebuild it when we need to. It will even be much simpler. - rm experimental/graphviz: it's broken for some time anyway, and we don't really need to play around with it as a rendering option anymore. - rm experimental/oneshot: we never use this anymore.
108 lines
1.9 KiB
Go
108 lines
1.9 KiB
Go
package main
|
|
|
|
import (
|
|
"log"
|
|
"net"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/weaveworks/scope/xfer"
|
|
)
|
|
|
|
var (
|
|
tick = time.Tick
|
|
lookupIP = net.LookupIP
|
|
)
|
|
|
|
type staticResolver struct {
|
|
quit chan struct{}
|
|
add func(string)
|
|
peers []peer
|
|
}
|
|
|
|
type peer struct {
|
|
hostname string
|
|
port string
|
|
}
|
|
|
|
// NewResolver starts a new resolver that periodically
|
|
// tries to resolve peers and the calls add() with all the
|
|
// resolved IPs. It explictiy supports hostnames which
|
|
// resolve to multiple IPs; it will repeatedly call
|
|
// add with the same IP, expecting the target to dedupe.
|
|
func newStaticResolver(peers []string, add func(string)) staticResolver {
|
|
r := staticResolver{
|
|
quit: make(chan struct{}),
|
|
add: add,
|
|
peers: prepareNames(peers),
|
|
}
|
|
go r.loop()
|
|
return r
|
|
}
|
|
|
|
func prepareNames(strs []string) []peer {
|
|
var results []peer
|
|
for _, s := range strs {
|
|
var (
|
|
hostname string
|
|
port string
|
|
)
|
|
|
|
if strings.Contains(s, ":") {
|
|
var err error
|
|
hostname, port, err = net.SplitHostPort(s)
|
|
if err != nil {
|
|
log.Printf("invalid address %s: %v", s, err)
|
|
continue
|
|
}
|
|
} else {
|
|
hostname, port = s, strconv.Itoa(xfer.AppPort)
|
|
}
|
|
|
|
results = append(results, peer{hostname, port})
|
|
}
|
|
return results
|
|
}
|
|
|
|
func (r staticResolver) loop() {
|
|
r.resolveHosts()
|
|
t := tick(time.Minute)
|
|
for {
|
|
select {
|
|
case <-t:
|
|
r.resolveHosts()
|
|
|
|
case <-r.quit:
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
func (r staticResolver) resolveHosts() {
|
|
for _, peer := range r.peers {
|
|
var addrs []net.IP
|
|
if addr := net.ParseIP(peer.hostname); addr != nil {
|
|
addrs = []net.IP{addr}
|
|
} else {
|
|
var err error
|
|
addrs, err = lookupIP(peer.hostname)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
}
|
|
|
|
for _, addr := range addrs {
|
|
// For now, ignore IPv6
|
|
if addr.To4() == nil {
|
|
continue
|
|
}
|
|
r.add(net.JoinHostPort(addr.String(), peer.port))
|
|
}
|
|
}
|
|
}
|
|
|
|
func (r staticResolver) Stop() {
|
|
close(r.quit)
|
|
}
|