diff --git a/clientpool/loggregator_client_pool.go b/clientpool/loggregator_client_pool.go index 29b3344..e4c2664 100644 --- a/clientpool/loggregator_client_pool.go +++ b/clientpool/loggregator_client_pool.go @@ -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, @@ -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 } diff --git a/clientpool/loggregator_client_pool_test.go b/clientpool/loggregator_client_pool_test.go index 83d3a51..cc7c434 100644 --- a/clientpool/loggregator_client_pool_test.go +++ b/clientpool/loggregator_client_pool_test.go @@ -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() { @@ -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() {