From 9a4c07d6992a6708aa572f4104630bc3374f2b7c Mon Sep 17 00:00:00 2001
From: Florian Fittkau <ffi@informatik.uni-kiel.de>
Date: Mon, 14 Apr 2014 12:34:32 +0200
Subject: [PATCH] defaults for config
---
...z.live_trace_processing.default.properties | 28 +++++++++++++++----
.../main/FilterConfiguration.java | 4 +--
.../main/WorkerStarter.java | 7 +++--
3 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/META-INF/explorviz.live_trace_processing.default.properties b/src/META-INF/explorviz.live_trace_processing.default.properties
index cc678a4..1f87cf8 100644
--- a/src/META-INF/explorviz.live_trace_processing.default.properties
+++ b/src/META-INF/explorviz.live_trace_processing.default.properties
@@ -1,6 +1,4 @@
-explorviz.live_trace_processing.worker_enabled=true
-
-explorviz.live_trace_processing.reader_listening_port=10133
+######################## Common ########################
explorviz.live_trace_processing.writer_target_ip=127.0.0.1
explorviz.live_trace_processing.writer_target_port=10133
@@ -9,7 +7,27 @@ explorviz.live_trace_processing.writer_load_balancing_enabled=false
explorviz.live_trace_processing.writer_load_balancing_ip=10.50.0.2
explorviz.live_trace_processing.writer_load_balancing_port=9999
explorviz.live_trace_processing.writer_load_balancing_wait_time=20000
-explorviz.live_trace_processing.writer_load_balancing_scaling_group=analysis-worker-2
+explorviz.live_trace_processing.writer_load_balancing_scaling_group=analysis-worker
+
+explorviz.live_trace_processing.sending_buffer_size=65536
+
+######################## Monitoring ########################
+
+explorviz.live_trace_processing.host_name=
+explorviz.live_trace_processing.application_name=
+
+explorviz.live_trace_processing.debug=false
+
+explorviz.live_trace_processing.monitoring_enabled=true
+explorviz.live_trace_processing.system_monitoring_enabled=true
+
+explorviz.live_trace_processing.monitoring_controller_disruptor_size=32
+
+######################## Analysis ########################
+
+explorviz.live_trace_processing.worker_enabled=true
+
+explorviz.live_trace_processing.reader_listening_port=10133
explorviz.live_trace_processing.tcp_reader_output_buffer_size=8192
explorviz.live_trace_processing.tcp_reader_disruptor_size=32
@@ -21,5 +39,3 @@ explorviz.live_trace_processing.trace_reconstruction_buffer_initial_size=1024
explorviz.live_trace_processing.trace_summarization_output_buffer_size=64
explorviz.live_trace_processing.trace_summarization_disruptor_size=16
-
-explorviz.live_trace_processing.sending_buffer_size=65536
\ No newline at end of file
diff --git a/src/explorviz/live_trace_processing/main/FilterConfiguration.java b/src/explorviz/live_trace_processing/main/FilterConfiguration.java
index d931289..98a3cde 100644
--- a/src/explorviz/live_trace_processing/main/FilterConfiguration.java
+++ b/src/explorviz/live_trace_processing/main/FilterConfiguration.java
@@ -23,7 +23,7 @@ public class FilterConfiguration {
final ITraceReconstruction traceReconstruction = new TraceReconstructionFilter(
TimeUnit.SECONDS.toNanos(4), traceReduction);
- new TCPReader(configuration.getIntProperty(ConfigurationFactory.READER_LISTENING_PORT),
- traceReconstruction).read();
+ new TCPReader(configuration.getIntProperty(ConfigurationFactory.READER_LISTENING_PORT,
+ 10133), traceReconstruction).read();
}
}
diff --git a/src/explorviz/live_trace_processing/main/WorkerStarter.java b/src/explorviz/live_trace_processing/main/WorkerStarter.java
index 5d191fc..c9e6fbe 100644
--- a/src/explorviz/live_trace_processing/main/WorkerStarter.java
+++ b/src/explorviz/live_trace_processing/main/WorkerStarter.java
@@ -21,7 +21,7 @@ public class WorkerStarter {
if (isWorker) {
final TCPConnector connector = new TCPConnector(
configuration.getStringProperty(ConfigurationFactory.WRITER_TARGET_IP),
- configuration.getIntProperty(ConfigurationFactory.WRITER_TARGET_PORT),
+ configuration.getIntProperty(ConfigurationFactory.WRITER_TARGET_PORT, 10133),
configuration);
configureLoadBalancerIfEnabled(configuration, connector);
@@ -39,8 +39,9 @@ public class WorkerStarter {
if (loadBalancerEnabled) {
new LoadBalancer(
configuration.getStringProperty(ConfigurationFactory.LOAD_BALANCER_IP),
- configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_PORT),
- configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_WAIT_TIME),
+ configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_PORT, 9999),
+ configuration.getIntProperty(ConfigurationFactory.LOAD_BALANCER_WAIT_TIME,
+ 20000),
configuration
.getStringProperty(ConfigurationFactory.LOAD_BALANCER_SCALING_GROUP),
tcpConnector);
--
GitLab