Skip to content
This repository has been archived by the owner on Jan 21, 2022. It is now read-only.

Commit

Permalink
Remove clientpool option to not build clients
Browse files Browse the repository at this point in the history
Signed-off-by: John Tuley <jtuley@pivotal.io>
  • Loading branch information
Mike Gehard authored and John Tuley committed Sep 3, 2014
1 parent 507ff1f commit b252010
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 25 deletions.
8 changes: 2 additions & 6 deletions clientpool/loggregator_client_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ var ErrorEmptyClientPool = errors.New("loggregator client pool is empty")
type LoggregatorClientPool struct {
clients map[string]loggregatorclient.LoggregatorClient
logger *gosteno.Logger
createClientsEnabled bool
loggregatorPort int
sync.RWMutex
}

func NewLoggregatorClientPool(logger *gosteno.Logger, port int, createClients bool) *LoggregatorClientPool {
func NewLoggregatorClientPool(logger *gosteno.Logger, port int) *LoggregatorClientPool {
return &LoggregatorClientPool{
createClientsEnabled: createClients,
loggregatorPort: port,
clients: make(map[string]loggregatorclient.LoggregatorClient),
logger: logger,
Expand Down Expand Up @@ -86,9 +84,7 @@ func (pool *LoggregatorClientPool) syncWithNodes(nodes []storeadapter.StoreNode)
}

var client loggregatorclient.LoggregatorClient
if pool.createClientsEnabled {
client = loggregatorclient.NewLoggregatorClient(addr, pool.logger, loggregatorclient.DefaultBufferSize)
}
client = loggregatorclient.NewLoggregatorClient(addr, pool.logger, loggregatorclient.DefaultBufferSize)
pool.clients[addr] = client
}

Expand Down
26 changes: 7 additions & 19 deletions clientpool/loggregator_client_pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var _ = Describe("LoggregatorClientPool", func() {

stopChan = make(chan struct{})
logger = steno.NewLogger("TestLogger")
pool = clientpool.NewLoggregatorClientPool(logger, 3456, false)
pool = clientpool.NewLoggregatorClientPool(logger, 3456)
})

Describe("RandomClient", func() {
Expand Down Expand Up @@ -94,26 +94,14 @@ var _ = Describe("LoggregatorClientPool", func() {
})
}

Context("with 'create clients' disabled", func() {
It("a nil client eventually appears in the pool", func() {
defer close(stopChan)
addServer()

Eventually(pool.ListClients).Should(HaveLen(1))
Expect(pool.ListClients()[0]).To(BeNil())
})
})

Context("with 'create clients' enabled", func() {
It("a non-nil client eventually appears in the pool", func() {
defer close(stopChan)
pool = clientpool.NewLoggregatorClientPool(logger, 3456, true)
It("a non-nil client eventually appears in the pool", func() {
defer close(stopChan)
pool = clientpool.NewLoggregatorClientPool(logger, 3456)

addServer()
addServer()

Eventually(pool.ListClients).Should(HaveLen(1))
Expect(pool.ListClients()[0]).ToNot(BeNil())
})
Eventually(pool.ListClients).Should(HaveLen(1))
Expect(pool.ListClients()[0]).ToNot(BeNil())
})

It("adds more servers later", func() {
Expand Down

0 comments on commit b252010

Please sign in to comment.