change hocon extension to .conf (#51)

Author: BrandonArp

README.md

@@ -133,7 +133,7 @@ Each of the pipeline configuration files should be placed in the *pipelinesDirec
 
 #### Hocon
 
-The daemon and pipeline configuration files may be written in [Hocon](https://github.com/typesafehub/config) when specified with a _.hocon_ extension. 
+The daemon and pipeline configuration files may be written in [Hocon](https://github.com/typesafehub/config) when specified with a _.conf extension. 
 
 Development
 -----------

config/config.hocon renamed to config/config.conf

@@ -7,7 +7,7 @@
 #   statistics on data and forwards them to upstream aggregation \
 #   services
 # processname: mad
-# config: /opt/mad/config/config.hocon
+# config: /opt/mad/config/config.conf
 # pidfile: /var/run/mad/mad.pid
 
 # Source function library.
@@ -19,7 +19,7 @@ dir="/opt/mad"
 log_dir="$dir/logs"
 exec="/opt/mad/bin/mad"
 pid_file="/var/run/mad/mad.pid"
-export CONFIG_FILE="/opt/mad/config/config.hocon"
+export CONFIG_FILE="/opt/mad/config/config.conf"
 export JAVA_HOME="$(dirname $(dirname $(readlink -f $(which java))))"
 export JVM_XMS="64m"
 export JVM_XMX="1024m"

rpm/fs/etc/rc.d/init.d/mad

@@ -23,7 +23,7 @@ WORKDIR /opt/mad
 ENV JVM_XMS="64m"
 ENV JVM_XMX="1024m"
 ENV LOGBACK_CONFIG="-Dlogback.configurationFile=/opt/mad/config/logback.xml"
-ENV APP_PARAMS="/opt/mad/config/config.hocon"
+ENV APP_PARAMS="/opt/mad/config/config.conf"
 ENV ADDITIONAL_APP_PARAMS=""
 ENV ADDITIONAL_JAVA_OPTS=""
 

src/main/docker/Dockerfile

@@ -354,7 +354,7 @@ private static Builder<? extends JsonNodeSource> getFileSourceBuilder(final File
     private static final Duration SHUTDOWN_TIMEOUT = Duration.create(30, TimeUnit.SECONDS);
     private static final Semaphore SHUTDOWN_SEMAPHORE = new Semaphore(0);
     private static final Thread SHUTDOWN_THREAD = new ShutdownThread();
-    private static final String HOCON_FILE_EXTENSION = ".hocon";
+    private static final String HOCON_FILE_EXTENSION = ".conf";
 
     private static final class PipelinesLaunchable implements Launchable, Runnable {
 

src/main/java/com/arpnetworking/metrics/mad/Main.java

@@ -60,7 +60,7 @@ public void testFileUnreadable() throws IOException {
 
     @Test
     public void testValidHocon() throws IOException {
-        final File file = new File("./target/tmp/filter/HoconFileSourceTest/testValidHocon.hocon");
+        final File file = new File("./target/tmp/filter/HoconFileSourceTest/testValidHocon.conf");
         Files.write(file.toPath(), "foo:\"bar\"".getBytes(Charsets.UTF_8));
         final HoconFileSource source = new HoconFileSource.Builder()
                 .setFile(file)