Remove Syncer.registerService()

This call is obsolete by a future commit that changes the canonical
source of truth to be consul.AgentServiceRegistration structs, which
means it is not necessary to construct AgentServiceRegistration
objects every time a registration is made, we just reuse the existing
object.
This commit is contained in:
Sean Chittenden
2016-06-08 02:08:50 -04:00
parent 57c2c819e8
commit b6a2ec2db8

View File

@@ -208,7 +208,7 @@ func (c *Syncer) SyncServices() error {
}
trackedService, ok := c.trackedServices[srv.ID]
if (ok && !reflect.DeepEqual(trackedService, srv)) || !ok {
if err := c.registerService(srv); err != nil {
if err := c.client.Agent().ServiceRegister(srv); err != nil {
mErr.Errors = append(mErr.Errors, err)
}
}
@@ -383,18 +383,6 @@ func (c *Syncer) createService(service *structs.ConsulService) (*consul.AgentSer
return &srv, nil
}
// registerService registers a service with Consul
func (c *Syncer) registerService(service *consul.AgentService) error {
srvReg := consul.AgentServiceRegistration{
ID: service.ID,
Name: service.Service,
Tags: service.Tags,
Port: service.Port,
Address: service.Address,
}
return c.client.Agent().ServiceRegister(&srvReg)
}
// deregisterService de-registers a service with the given ID from consul
func (c *Syncer) deregisterService(ID string) error {
return c.client.Agent().ServiceDeregister(ID)