overflow_cloud/container_discovery
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2018-04-20 00:25:07 +09:00
parent 0720771a87
commit aca4ca25c6
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/discoverer/discoverer.go
View File

@ -4,8 +4,6 @@ import (
"sync" "sync"
"time" "time"
"git.loafle.net/commons/logging-go"
"git.loafle.net/commons/util-go/net/cidr" "git.loafle.net/commons/util-go/net/cidr"
ocdm "git.loafle.net/overflow/commons-go/discovery/model" ocdm "git.loafle.net/overflow/commons-go/discovery/model"
) )
@ -152,7 +150,6 @@ func (d *defaultDiscoverer) innerDiscoverZone(wg *sync.WaitGroup, dataChan chan
}, },
func(result interface{}) { func(result interface{}) {
z := result.(*ocdm.Zone) z := result.(*ocdm.Zone)
logging.Logger().Debugf("zone discovered: %v", z)
dataChan <- retainDiscoveryData(DiscoveryDataTypeZone, time.Now(), z, nil) dataChan <- retainDiscoveryData(DiscoveryDataTypeZone, time.Now(), z, nil)
if nil != dz.DiscoveryHost { if nil != dz.DiscoveryHost {
cr, _ := cidr.NewCIDRRanger(z.Network) cr, _ := cidr.NewCIDRRanger(z.Network)
@ -182,7 +179,6 @@ func (d *defaultDiscoverer) innerDiscoverHost(wg *sync.WaitGroup, dataChan chan
}, },
func(result interface{}) { func(result interface{}) {
h := result.(*ocdm.Host) h := result.(*ocdm.Host)
logging.Logger().Debugf("host discovered: %v", h)
dataChan <- retainDiscoveryData(DiscoveryDataTypeHost, time.Now(), h, nil) dataChan <- retainDiscoveryData(DiscoveryDataTypeHost, time.Now(), h, nil)
if nil != dh.DiscoveryPort { if nil != dh.DiscoveryPort {
wg.Add(1) wg.Add(1)
@ -206,7 +202,6 @@ func (d *defaultDiscoverer) innerDiscoverPort(wg *sync.WaitGroup, dataChan chan
}, },
func(result interface{}) { func(result interface{}) {
p := result.(*ocdm.Port) p := result.(*ocdm.Port)
logging.Logger().Debugf("port discovered: %v", p)
dataChan <- retainDiscoveryData(DiscoveryDataTypePort, time.Now(), p, nil) dataChan <- retainDiscoveryData(DiscoveryDataTypePort, time.Now(), p, nil)
if nil != dp.DiscoveryService { if nil != dp.DiscoveryService {
wg.Add(1) wg.Add(1)
@ -230,7 +225,6 @@ func (d *defaultDiscoverer) innerDiscoverSerice(wg *sync.WaitGroup, dataChan cha
}, },
func(result interface{}) { func(result interface{}) {
s := result.(*ocdm.Service) s := result.(*ocdm.Service)
logging.Logger().Debugf("service discovered: %v", s)
dataChan <- retainDiscoveryData(DiscoveryDataTypeService, time.Now(), s, nil) dataChan <- retainDiscoveryData(DiscoveryDataTypeService, time.Now(), s, nil)
}, },
func(err error) { func(err error) {

2
internal/discoverer/ipv4/host.go
View File

@ -48,7 +48,7 @@ func ScanHost(zone *ocdm.Zone, dh *ocdm.DiscoveryHost, resultChan chan interface
select { select {
case packet, ok := <-arpChan: case packet, ok := <-arpChan:
if !ok { if !ok {
logging.Logger().Debugf("Discovery: arp channel is closed") logging.Logger().Debugf("arp channel is closed")
return return
} }
if h := handlePacketARP(zone, hostRanges, hosts, packet); nil != h { if h := handlePacketARP(zone, hostRanges, hosts, packet); nil != h {

3
service/DiscoveryService.go
View File

@ -7,7 +7,6 @@ import (
cda "git.loafle.net/commons/di-go/annotation" cda "git.loafle.net/commons/di-go/annotation"
cdr "git.loafle.net/commons/di-go/registry" cdr "git.loafle.net/commons/di-go/registry"
"git.loafle.net/commons/logging-go"
ocdm "git.loafle.net/overflow/commons-go/discovery/model" ocdm "git.loafle.net/overflow/commons-go/discovery/model"
ocs "git.loafle.net/overflow/container-go/service" ocs "git.loafle.net/overflow/container-go/service"
"git.loafle.net/overflow/container_discovery/internal/discoverer" "git.loafle.net/overflow/container_discovery/internal/discoverer"
@ -127,10 +126,8 @@ func (s *DiscoveryService) handleDiscovery(requesterID string, discoveryFunc fun
} }
switch data.Type { switch data.Type {
case discoverer.DiscoveryDataTypeStart: case discoverer.DiscoveryDataTypeStart:
logging.Logger().Debugf("DiscoveryService.DiscoveryStart: %s", data.Time.String())
s.ProbeService.Send("DiscoveryService.DiscoveryStart", requesterID, data.Time) s.ProbeService.Send("DiscoveryService.DiscoveryStart", requesterID, data.Time)
case discoverer.DiscoveryDataTypeStop: case discoverer.DiscoveryDataTypeStop:
logging.Logger().Debugf("DiscoveryService.DiscoveryStop: %s", data.Time.String())
s.ProbeService.Send("DiscoveryService.DiscoveryStop", requesterID, data.Time) s.ProbeService.Send("DiscoveryService.DiscoveryStop", requesterID, data.Time)
data.Release() data.Release()
return nil return nil