Skip to content

Commit 365a0a7

Browse files
authored
change .hocon extension to .conf (#54)
1 parent 57df753 commit 365a0a7

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ For example:
160160
#### Hocon
161161

162162
The daemon and pipeline configuration files may be written in [Hocon](https://github.com/typesafehub/config)
163-
when specified with a _.hocon_ extension.
163+
when specified with a _.conf extension.
164164

165165
Development
166166
-----------
File renamed without changes.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
monitoringCluster="cagg"
22
logDirectory="logs"
3-
hostPipelineConfiguration="/opt/cluster-aggregator/config/hostPipeline.hocon"
4-
clusterPipelineConfiguration="/opt/cluster-aggregator/config/clusterPipeline.hocon"
3+
hostPipelineConfiguration="/opt/cluster-aggregator/config/hostPipeline.conf"
4+
clusterPipelineConfiguration="/opt/cluster-aggregator/config/clusterPipeline.conf"
55
httpHost="0.0.0.0"
66
httpPort=7066
77
httpHealthCheckPath="/ping"
File renamed without changes.

rpm/fs/etc/init.d/cluster-aggregator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dir="/opt/cluster-aggregator"
1818
log_dir="$dir/logs"
1919
exec="/opt/cluster-aggregator/bin/cluster-aggregator"
2020
pid_file="/var/run/cluster-aggregator/cluster-aggregator.pid"
21-
export CONFIG_FILE="/opt/cluster-aggregator/config/config.hocon"
21+
export CONFIG_FILE="/opt/cluster-aggregator/config/config.conf"
2222
export JAVA_HOME="$(dirname $(dirname $(readlink -f $(which java))))"
2323
export JVM_XMS="64m"
2424
export JVM_XMX="1024m"

src/main/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ WORKDIR /opt/cluster-aggregator
2424
ENV JVM_XMS="64m"
2525
ENV JVM_XMX="1024m"
2626
ENV LOGBACK_CONFIG="-Dlogback.configurationFile=/opt/cluster-aggregator/config/logback.xml"
27-
ENV APP_PARAMS="/opt/cluster-aggregator/config/config.hocon"
27+
ENV APP_PARAMS="/opt/cluster-aggregator/config/config.conf"
2828
ENV ADDITIONAL_APP_PARAMS=""
2929
ENV ADDITIONAL_JAVA_OPTS=""
3030

src/main/java/com/arpnetworking/clusteraggregator/GuiceModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ private PartitionSet provideDatabasePartitionSet(@Named("metrics_clusteragg") fi
380380

381381
private final ClusterAggregatorConfiguration _configuration;
382382

383-
private static final String HOCON_FILE_EXTENSION = ".hocon";
383+
private static final String HOCON_FILE_EXTENSION = ".conf";
384384
private static final ObjectMapper OBJECT_MAPPER = ObjectMapperFactory.getInstance();
385385

386386
private static final class RoundRobinEmitterFactory implements ConfiguredLaunchableFactory<Props, EmitterConfiguration> {

src/main/java/com/arpnetworking/clusteraggregator/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ private static Builder<? extends JsonNodeSource> getFileSourceBuilder(
268268
private static final SourceTypeLiteral SOURCE_TYPE_LITERAL = new SourceTypeLiteral();
269269
private static final Semaphore SHUTDOWN_SEMAPHORE = new Semaphore(0);
270270
private static final Thread SHUTDOWN_THREAD = new ShutdownThread();
271-
private static final String HOCON_FILE_EXTENSION = ".hocon";
271+
private static final String HOCON_FILE_EXTENSION = ".conf";
272272

273273
private static final class ShutdownThread extends Thread {
274274
private ShutdownThread() {

0 commit comments

Comments
 (0)