From d2f2b4b6db4eaf68fac6e384beefa0f11cd3a183 Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Thu, 3 Sep 2015 08:24:08 -0700 Subject: [PATCH] Use a default zookeepers constant instead of trying to load a configuration file --- src/main/groovy/offtopic/Configuration.groovy | 1 + src/main/groovy/offtopic/OfftopicClient.groovy | 2 +- src/ratpack/ratpack.groovy | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/offtopic/Configuration.groovy b/src/main/groovy/offtopic/Configuration.groovy index 02bda35..1531b42 100644 --- a/src/main/groovy/offtopic/Configuration.groovy +++ b/src/main/groovy/offtopic/Configuration.groovy @@ -8,6 +8,7 @@ import groovy.util.logging.Slf4j @Singleton @Slf4j class Configuration extends Properties { + static final String DEFAULT_ZOOKEEPERS = 'localhost:2181' /** * Load defaults, starting in the current working directory, searching for * 'offtopic.properties' diff --git a/src/main/groovy/offtopic/OfftopicClient.groovy b/src/main/groovy/offtopic/OfftopicClient.groovy index 00a658c..a05440a 100644 --- a/src/main/groovy/offtopic/OfftopicClient.groovy +++ b/src/main/groovy/offtopic/OfftopicClient.groovy @@ -31,7 +31,7 @@ class OfftopicClient { return } - KafkaSubscriber subscriber = new KafkaSubscriber(System.getProperty('zookeepers') ?: Configuration.instance.zookeepers, + KafkaSubscriber subscriber = new KafkaSubscriber(System.getProperty('zookeepers') ?: Configuration.DEFAULT_ZOOKEEPERS, topic, "offtopic-${clientId}") subscriber.callback = this.messageCallback diff --git a/src/ratpack/ratpack.groovy b/src/ratpack/ratpack.groovy index 2e1693f..f1e584b 100644 --- a/src/ratpack/ratpack.groovy +++ b/src/ratpack/ratpack.groovy @@ -19,7 +19,7 @@ import offtopic.OfftopicClient ratpack { bindings { offtopic.Configuration.instance.loadDefaults() - offtopic.curator.CuratorPool.prepare(System.getProperty('zookeepers') ?: Configuration.instance.zookeepers) + offtopic.curator.CuratorPool.prepare(System.getProperty('zookeepers') ?: Configuration.DEFAULT_ZOOKEEPERS) module HandlebarsModule module JacksonModule }